Changeset 7887 in orxonox.OLD

Timestamp:

May 27, 2006, 2:52:26 AM (18 years ago)

Author:

bensch

Message:

gui: release only if pushed before

Location:

branches/gui/src/lib/gui/gl_gui

Files:

• glgui_widget.cc (modified) (5 diffs)
• glgui_widget.h (modified) (1 diff)

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

@@ -57 +57 @@
     this->_focusable = false;
     this->_clickable = false;
+    this->_pushed = false;
+
     this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 
@@ -64 +66 @@
     this->frontModel = 0;
     this->backModel = 0;
+
 
     this->widgetSignals.resize(SignalCount, SignalConnector());
@@ -79 +82 @@
   {
     GLGuiWidget::_focused = NULL;
+    this->_pushed = false;
     this->removedFocus();
   };
@@ -96 +100 @@
   void GLGuiWidget::click()
   {
+    assert (!this->_pushed);
     this->widgetSignals[Signal_click]("none");
+    this->_pushed = true;
 
     this->clicked();
@@ -103 +109 @@
   void GLGuiWidget::release()
   {
-    this->widgetSignals[Signal_release]("none");
+    if (this->_pushed)
+    {
+      this->widgetSignals[Signal_release]("none");
 
-    this->released();
+      this->released();
+      this->_pushed = false;
+    }
   }
 

branches/gui/src/lib/gui/gl_gui/glgui_widget.h

@@ -128 +128 @@
     bool                           _clickable;        //!< if this widget can be clicked upon.
 
+    bool                           _pushed;
+
     static GLGuiWidget*            _focused;
     static GLGuiWidget*            _inputGrabber;