Changeset 9370 for OpenSceneGraph/trunk/examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp

Timestamp:

12/16/08 21:29:00 (5 years ago)

Author:

robert

Message:

From Cedric Pinson and Jeremey Moles, Changes to OpenSceneGraph-osgWidget-dev branch.

Notes from Robert Osfield, Merged changes to OpenSceneGraph-osgWidget-dev r9367 (prior to my botched attempt at merged svn/trunk into the branch).

Files:

• OpenSceneGraph/trunk/examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp

@@ -119 +119 @@
     float _width;
     float _height;
+    osg::Matrix _matrix;
     EventOK(osgWidget::Frame* frame) : osgWidget::Callback(osgWidget::EVENT_ALL), _frame(frame) 
     {
@@ -139 +140 @@
             _height = _frame->getHeight();
             _motionOver.reset();
+            _matrix = _frame->getMatrix();
+            //_frame->setMatrix(osg::Matrix::scale(2, 2, 1) * _frame->getMatrix());
+            _frame->setScale(1.1f); //osg::Matrix::scale(2, 2, 1) * _frame->getMatrix());
+            _frame->update(); //osg::Matrix::scale(2, 2, 1) * _frame->getMatrix());
             std::cout << "enter" << std::endl;
             return true;
         }
-        else if (ev.type == osgWidget::EVENT_MOUSE_LEAVE) 
+        else if (ev.type == osgWidget::EVENT_MOUSE_LEAVE)
         {
             _over = false;
             _motionLeave.reset();
+            //_frame->setMatrix(_matrix);
+            _frame->setScale(1.0f);
+            _frame->update();
             std::cout << "leave" << std::endl;
             return true;
@@ -219 +227 @@
     box->getBackground()->setColor(colorBack);
     frame->getEmbeddedWindow()->setWindow(box);
+    box->setVisibilityMode(osgWidget::Window::VM_ENTIRE);
     box->setEventMask(osgWidget::EVENT_NONE);
+    frame->setVisibilityMode(osgWidget::Window::VM_ENTIRE);
 
     frame->resizeFrame(box->getWidth(), box->getHeight());
@@ -256 +266 @@
     _button = createButtonOk(themeButton, buttonText, font, fontSize);
     osgWidget::Widget* buttonOK = _button->embed();
+    _button->setVisibilityMode(osgWidget::Window::VM_ENTIRE);
     buttonOK->setColor(osgWidget::Color(0,0,0,0));
     buttonOK->setCanFill(false);
+
+    labelTitle->setPadBottom(30.0f);
+    labelText->setPadBottom(30.0f);
 
     box->addWidget(buttonOK);
@@ -326 +340 @@
     osgWidget::point_type ox = (w - ww) / 2;
     osgWidget::point_type oy = (h - hw) / 2;
-    message.getWindow()->setPosition(osgWidget::Point(ox, oy, message.getWindow()->getPosition()[2] ));
+    message.getWindow()->setPosition(osgWidget::Point(
+        osg::round(ox), osg::round(oy), message.getWindow()->getPosition()[2])
+    );
 //    frame->resizeAdd(30, 30);
 
 //    AlphaSetterVisitor alpha(.8f);
 //    frame->accept(alpha);
-    return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osg"));
+    return osgWidget::createExample(viewer, wm); //osgDB::readNodeFile("cow.osg"));
 
 }
@@ -567 +583 @@
     box->getBackground()->setColor(colorBack);
     frame->getEmbeddedWindow()->setWindow(box);
+    box->setVisibilityMode(osgWidget::Window::VM_ENTIRE);
     box->setEventMask(osgWidget::EVENT_NONE);