Changeset 7879 in orxonox.OLD

Timestamp:

May 26, 2006, 11:09:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: some cleanup

Location:

branches/gui/src/lib/gui/gl_gui

Files:

• glgui_cursor.cc (modified) (1 diff)
• glgui_widget.cc (modified) (1 diff)
• glgui_widget.h (modified) (1 diff)

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

@@ -66 +66 @@
     this->backMaterial().setDiffuse(color.x, color.y, color.z);
 
-    if (this->movement != Vector2D())
+    //if (this->movement != Vector2D())
     {
 /*      if (this->getAbsCoor2D().x < 0.0 )

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

@@ -40 +40 @@
   {
   }
+
+  GLGuiWidget* GLGuiWidget::_focused = NULL;
+  GLGuiWidget* GLGuiWidget::_inputGrabber = NULL;
+
 
 

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

@@ -87 +87 @@
 
   protected:
-    Material               backMat;
-    GLuint                 backModel;
+    Material                       backMat;
+    GLuint                         backModel;
 
-    Material               frontMat;
-    GLuint                 frontModel;
+    Material                       frontMat;
+    GLuint                         frontModel;
 
   private:
-    std::vector<SignalConnector> widgetSignals;
+    std::vector<SignalConnector>   widgetSignals;
 
-    bool                   focusable;        //!< If this widget can receive focus.
-    bool                   clickable;        //!< if this widget can be clicked upon.
+    bool                           focusable;        //!< If this widget can receive focus.
+    bool                           clickable;        //!< if this widget can be clicked upon.
+
+    static GLGuiWidget*            _focused;
+    static GLGuiWidget*            _inputGrabber;
   };
 }