Changeset 8652 in orxonox.OLD

Timestamp:

Jun 21, 2006, 1:15:24 AM (18 years ago)

Author:

bensch

Message:

renamings

Location:

branches/gui/src/lib/gui/gl

Files:

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

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

@@ -104 +104 @@
     {
       case  EV_MOUSE_BUTTON_LEFT:
-        if (GLGuiWidget::focused() != NULL)
+        if (GLGuiWidget::mouseFocused() != NULL)
         {
           if (event.bPressed)
           {
-            if (GLGuiWidget::focused()->clickable())
+            if (GLGuiWidget::mouseFocused()->clickable())
             {
               Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
-              GLGuiWidget::focused()->click(cursorPos - GLGuiWidget::focused()->getAbsCoor2D());
+              GLGuiWidget::mouseFocused()->click(cursorPos - GLGuiWidget::mouseFocused()->getAbsCoor2D());
             }
           }
           else
           {
-            if (GLGuiWidget::focused()->clickable())
+            if (GLGuiWidget::mouseFocused()->clickable())
             {
               Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
-              GLGuiWidget::focused()->release(cursorPos - GLGuiWidget::focused()->getAbsCoor2D());
+              GLGuiWidget::mouseFocused()->release(cursorPos - GLGuiWidget::mouseFocused()->getAbsCoor2D());
             }
           }
@@ -125 +125 @@
         break;
       case EV_LEAVE_STATE:
-        if (GLGuiWidget::focused() != NULL)
-          GLGuiWidget::focused()->breakFocus();
+        if (GLGuiWidget::mouseFocused() != NULL)
+          GLGuiWidget::mouseFocused()->breakMouseFocus();
         break;
 
@@ -137 +137 @@
 
 
-    if (GLGuiWidget::focused())
-    {
-      GLGuiWidget::focused()->processEvent(event);
+    if (GLGuiWidget::mouseFocused())
+    {
+      GLGuiWidget::mouseFocused()->processEvent(event);
     }
 
@@ -192 +192 @@
         {
           // receiving Focus
-          if (GLGuiWidget::focused() != widget)
+          if (GLGuiWidget::mouseFocused() != widget)
           {
-            widget->giveFocus();
+            widget->giveMouseFocus();
           }
           return ;
         }
       }
-      if (GLGuiWidget::focused() != NULL)
-        GLGuiWidget::focused()->breakFocus();
+      if (GLGuiWidget::mouseFocused() != NULL)
+        GLGuiWidget::mouseFocused()->breakMouseFocus();
     }
   }

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

@@ -264 +264 @@
 
     glEnd();
+
+
 
     this->endDraw();

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

@@ -72 +72 @@
   GLGuiWidget::~GLGuiWidget()
   {
-    if (this == GLGuiWidget::_focused)
-      GLGuiWidget::_focused = NULL;
+    if (this == GLGuiWidget::_mouseFocused)
+      GLGuiWidget::_mouseFocused = NULL;
   }
 
   GLGuiWidget* GLGuiWidget::_selected = NULL;
-  GLGuiWidget* GLGuiWidget::_focused = NULL;
+  GLGuiWidget* GLGuiWidget::_mouseFocused = NULL;
   GLGuiWidget* GLGuiWidget::_inputGrabber = NULL;
 
@@ -134 +134 @@
 
   /** @brief gives focus to this widget */
-  void GLGuiWidget::giveFocus()
-  {
-    if (GLGuiWidget::focused() != NULL)
-      GLGuiWidget::focused()->breakFocus();
-    GLGuiWidget::_focused = this;
+  void GLGuiWidget::giveMouseFocus()
+  {
+    if (GLGuiWidget::mouseFocused() != NULL)
+      GLGuiWidget::mouseFocused()->breakMouseFocus();
+    GLGuiWidget::_mouseFocused = this;
     this->receivedFocus();
   };
 
-  void GLGuiWidget::breakFocus()
-  {
-    if (GLGuiWidget::_focused == this)
+  void GLGuiWidget::breakMouseFocus()
+  {
+    if (GLGuiWidget::_mouseFocused == this)
     {
-      GLGuiWidget::_focused = NULL;
+      GLGuiWidget::_mouseFocused = NULL;
       this->_pushed = false;
       this->removedFocus();

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

@@ -43 +43 @@
     /// FOCUS
     /** @brief gives focus to this widget */
-    void giveFocus();
-    void breakFocus();
+    void giveMouseFocus();
+    void breakMouseFocus();
     /** @returns true if the widget is focusable */
     bool focusable() const { return this->_focusable; };
@@ -55 +55 @@
 
     /** @returns the currently focused Widget (NULL if none is selected) */
-    static GLGuiWidget* focused() { return GLGuiWidget::_focused; };
+    static GLGuiWidget* mouseFocused() { return GLGuiWidget::_mouseFocused; };
 
 
@@ -251 +251 @@
   private:
     static GLGuiWidget*            _selected;         //!< The currently selected Widget.
-    static GLGuiWidget*            _focused;          //!< The currently Focused Widget (mouse-focus).
+    static GLGuiWidget*            _mouseFocused;     //!< The currently Focused Widget (mouse-focus).
     static GLGuiWidget*            _inputGrabber;     //!< The Widget that grabs input (keyboard-focus).