Changeset 8653 in orxonox.OLD

Timestamp:

Jun 21, 2006, 1:26:27 AM (18 years ago)

Author:

bensch

Message:

select works (more or less)

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_handler.cc (modified) (2 diffs)
• glgui_inputline.cc (modified) (1 diff)
• glgui_widget.cc (modified) (2 diffs)
• glgui_widget.h (modified) (1 diff)

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

@@ -111 +111 @@
             {
               Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
+              GLGuiWidget::mouseFocused()->select();
               GLGuiWidget::mouseFocused()->click(cursorPos - GLGuiWidget::mouseFocused()->getAbsCoor2D());
             }
@@ -137 +138 @@
 
 
-    if (GLGuiWidget::mouseFocused())
-    {
-      GLGuiWidget::mouseFocused()->processEvent(event);
+    if (GLGuiWidget::selected())
+    {
+      GLGuiWidget::selected()->processEvent(event);
     }
 

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

@@ -47 +47 @@
 
     this->setFocusable(true);
+    this->setClickable(true);
 
     this->_clearOnEnter = false;

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

@@ -74 +74 @@
     if (this == GLGuiWidget::_mouseFocused)
       GLGuiWidget::_mouseFocused = NULL;
+    if (this == GLGuiWidget::selected())
+      this->unselect();
   }
 
@@ -162 +164 @@
   {
     return this->focusOverWidget(cursor->getAbsCoor2D());
+  }
+
+
+  void GLGuiWidget::select()
+  {
+    if (GLGuiWidget::selected() != NULL)
+      GLGuiWidget::selected()->unselect();
+    GLGuiWidget::_selected = this;
+  }
+
+  void GLGuiWidget::unselect()
+  {
+    if (GLGuiWidget::selected() != this)
+      _selected = NULL;
   }
 

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

@@ -57 +57 @@
     static GLGuiWidget* mouseFocused() { return GLGuiWidget::_mouseFocused; };
 
+    /// SELECT
+    static GLGuiWidget* selected() { return GLGuiWidget::_selected; };
+    void select();
+    void unselect();
 
     /// CLICK