Changeset 8669 in orxonox.OLD

Timestamp:

Jun 21, 2006, 2:11:21 PM (18 years ago)

Author:

bensch

Message:

orxonox/gui: slider behaves as expected

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_checkbutton.cc (modified) (1 diff)
• glgui_handler.cc (modified) (1 diff)
• glgui_pushbutton.cc (modified) (1 diff)
• glgui_slider.cc (modified) (1 diff)
• glgui_widget.cc (modified) (1 diff)

branches/gui/src/lib/gui/gl/glgui_checkbutton.cc

@@ -81 +81 @@
   {
     GLGuiButton::releasing(pos, focused);
-    this->toggleActiveState();
+    if (focused)
+      this->toggleActiveState();
   }
 

branches/gui/src/lib/gui/gl/glgui_handler.cc

@@ -210 +210 @@
   {
     // do not change if we already clicked into a Widget.
-    if (GLGuiWidget::selected() != NULL && GLGuiWidget::selected()->pushed())
-      return ;
+    // if (GLGuiWidget::selected() != NULL && GLGuiWidget::selected()->pushed())
+    //      return ;
 
     this->checkFocus();

branches/gui/src/lib/gui/gl/glgui_pushbutton.cc

@@ -84 +84 @@
   {
     printf("%s released\n", this->label().c_str());
-    GLGuiButton::releasing(pos, focused);
+    if (focused)
+      GLGuiButton::releasing(pos, focused);
   }
 

branches/gui/src/lib/gui/gl/glgui_slider.cc

@@ -202 +202 @@
   {
     GLGuiWidget::removedFocus();
-    this->grabbed = false;
   }
 

branches/gui/src/lib/gui/gl/glgui_widget.cc

@@ -174 +174 @@
   void GLGuiWidget::breakMouseFocus()
   {
+    printf("TESTING UNFOCUSING\n");
     if (GLGuiWidget::_mouseFocused == this)
     {
       GLGuiWidget::_mouseFocused = NULL;
-      this->_pushed = false;
 
       if (GLGuiWidget::_selected != this)