Changeset 7943 in orxonox.OLD

Timestamp:

May 28, 2006, 11:32:00 PM (18 years ago)

Author:

bensch

Message:

gui: selected introduced

Location:

branches/gui/src/lib/gui/gl_gui

Files:

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

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

@@ -157 +157 @@
       return Vector2D::nullVector();
   }
-  const Vector2D& GLGuiHandler::cursorPositionRel(const GLGuiWidget* const widget) const
+  Vector2D GLGuiHandler::cursorPositionRel(const GLGuiWidget* const widget) const
   {
     assert (widget != NULL);

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

@@ -32 +32 @@
     Vector2D cursorPositionOverFocusedWidget() const;
     const Vector2D& cursorPositionAbs() const;
-    const Vector2D& cursorPositionRel(const GLGuiWidget* const widget) const;
+    Vector2D cursorPositionRel(const GLGuiWidget* const widget) const;
 
     void activate();

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

@@ -48 +48 @@
   }
 
+  GLGuiWidget* GLGuiWidget::_selected = NULL;
   GLGuiWidget* GLGuiWidget::_focused = NULL;
   GLGuiWidget* GLGuiWidget::_inputGrabber = NULL;
@@ -97 +98 @@
   {
     return (this->getAbsCoor2D().x < position.x && this->getAbsCoor2D().x + this->getSizeX2D() > position.x &&
-        this->getAbsCoor2D().y < position.y && this->getAbsCoor2D().y + this->getSizeY2D() > position.y);
+            this->getAbsCoor2D().y < position.y && this->getAbsCoor2D().y + this->getSizeY2D() > position.y);
   }
 
@@ -164 +165 @@
 
   void GLGuiWidget::destroyed()
-  {
-  };
+  {}
+  ;
 
 
@@ -180 +181 @@
       return;
 
-//    if (this->widgetSignals[signalType] != NULL)
-//      PRINTF(2)("Already connected a Signal to '%s::%s' type %s... overwriting\n", this->getClassName(), this->getName(), "TEST");
+    //    if (this->widgetSignals[signalType] != NULL)
+    //      PRINTF(2)("Already connected a Signal to '%s::%s' type %s... overwriting\n", this->getClassName(), this->getName(), "TEST");
 
     this->widgetSignals[signalType] = SignalConnector(object, signal);

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

@@ -164 +164 @@
     bool                           _pushed;
 
-    static GLGuiWidget*            _focused;
-    static GLGuiWidget*            _inputGrabber;
+    static GLGuiWidget*            _selected;         //!< The currently selected Widget.
+    static GLGuiWidget*            _focused;          //!< The currently Focused Widget.
+
+    static GLGuiWidget*            _inputGrabber;     //!< The Widget that grabs input.
   };
 }