Changeset 7881 in orxonox.OLD

Timestamp:

May 26, 2006, 11:46:07 PM (18 years ago)

Author:

bensch

Message:

trunk: better focus

Location:

branches/gui/src/lib/gui/gl_gui

Files:

• glgui_button.h (modified) (1 diff)
• glgui_handler.cc (modified) (1 diff)
• glgui_pushbutton.cc (modified) (1 diff)
• glgui_pushbutton.h (modified) (1 diff)

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

@@ -36 +36 @@
     virtual ~GLGuiButton();
 
+    const std::string& getLabel() const { return this->label.getText(); };
     void setLabel(const std::string& label);
 

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

@@ -107 +107 @@
       {
         GLGuiWidget* widget = dynamic_cast<GLGuiWidget*>(*it);
-        if (widget->focusOverWidget(this->cursor->getAbsCoor2D().x, this->cursor->getAbsCoor2D().y))
+        if (widget->isVisible() && widget->focusOverWidget(this->cursor->getAbsCoor2D().x, this->cursor->getAbsCoor2D().y))
         {
           // receiving Focus
           if (GLGuiWidget::focused() != widget)
           {
-            printf("yeah\n");
             widget->giveFocus();
+            printf("%s\n", widget->getClassName());
           }
         }

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

@@ -50 +50 @@
   }
 
+  void GLGuiPushButton::receivedFocus()
+  {
+    printf("%s received focus\n", this->getLabel().c_str());
+
+  }
+  void GLGuiPushButton::removedFocus()
+  {
+    printf("%s removed focus\n", this->getLabel().c_str());
+
+  }
+
+
+
+
   /**
    * draws the GLGuiPushButton

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

@@ -27 +27 @@
 
 
+    virtual void receivedFocus();
+    virtual void removedFocus();
     virtual void draw() const;
     virtual void update();