Changeset 7880 in orxonox.OLD

Timestamp:

May 26, 2006, 11:35:21 PM (18 years ago)

Author:

bensch

Message:

focusable widgets

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_handler.cc (modified) (4 diffs)
• lib/gui/gl_gui/glgui_handler.h (modified) (3 diffs)
• lib/gui/gl_gui/glgui_widget.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.h (modified) (2 diffs)
• story_entities/simple_game_menu.cc (modified) (2 diffs)

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

@@ -6 +6 @@
 #ifndef _GLGUI_H
 #define _GLGUI_H
+
+#include "glgui_handler.h"
+
 #include "glgui_widget.h"
 

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

@@ -20 +20 @@
 
 #include "glgui_mainwidget.h"
+#include "glgui_cursor.h"
+
+#include "class_list.h"
+
 
 namespace OrxGui
@@ -32 +36 @@
     this->setName("GLGuiHandler");
 
+
+    this->cursor = NULL;
     //this->subscribeEvent()
 
@@ -48 +54 @@
     GLGuiHandler::singletonRef = NULL;
   }
+
+  void GLGuiHandler::activateCursor()
+  {
+    this->cursor = new GLGuiCursor();
+    this->cursor->show();
+  }
+
+  void GLGuiHandler::deactivateCursor()
+  {
+    if (this->cursor)
+    {
+      delete this->cursor;
+      this->cursor = NULL;
+    }
+  }
+
 
   void GLGuiHandler::activate()
@@ -76 +98 @@
   void GLGuiHandler::tick(float dt)
   {
+
+    // CHECK THE COLLISIONS.
+    const std::list<BaseObject*>* objects = ClassList::getList(CL_GLGUI_WIDGET);
+
+    if (objects != NULL && this->cursor != NULL)
+    {
+      for (std::list<BaseObject*>::const_iterator it = objects->begin(); it != objects->end(); it++)
+      {
+        GLGuiWidget* widget = dynamic_cast<GLGuiWidget*>(*it);
+        if (widget->focusOverWidget(this->cursor->getAbsCoor2D().x, this->cursor->getAbsCoor2D().y))
+        {
+          // receiving Focus
+          if (GLGuiWidget::focused() != widget)
+          {
+            printf("yeah\n");
+            widget->giveFocus();
+          }
+        }
+      }
+    }
   }
 }

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

@@ -8 +8 @@
 
 #include "event_listener.h"
+#include "glgui_widget.h"
 
 namespace OrxGui
 {
+
+  class GLGuiCursor;
+
   // FORWARD DECLARATION
 
@@ -21 +25 @@
     /** @returns a Pointer to the only object of this Class */
     inline static GLGuiHandler* getInstance(void) { if (!GLGuiHandler::singletonRef) GLGuiHandler::singletonRef = new GLGuiHandler();  return GLGuiHandler::singletonRef; };
+
+    void activateCursor();
+    void deactivateCursor();
+    GLGuiCursor* getCursor() const { return this->cursor; }
 
     void activate();
@@ -36 +44 @@
 
     bool                 isActive;
+    GLGuiCursor*         cursor;
+
   };
 }

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

@@ -65 +65 @@
 
 
-  bool GLGuiWidget::focusOverWidget(float x, float y)
+  bool GLGuiWidget::focusOverWidget(float x, float y) const
   {
     if (this->getAbsCoor2D().x < x && this->getAbsCoor2D().x + this->getSizeX2D() > x &&

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

@@ -52 +52 @@
     void hide();
 
+    void giveFocus() { GLGuiWidget::_focused = this; this->receivedFocus(); };
+
     void connectSignal(SignalType signalType, BaseObject* obj, const Executor* signal);
     void disconnectSignal(SignalType signalType);
-    bool focusOverWidget(float x, float y);
+    bool focusOverWidget(float x, float y) const;
 
 
@@ -65 +67 @@
     Material& frontMaterial() { return this->frontMat; };
     const Material& frontMaterial() const { return this->frontMat; };
+
+
+
+    static const GLGuiWidget* const focused() { return GLGuiWidget::_focused; };
+
 
   protected:

branches/gui/src/story_entities/simple_game_menu.cc

@@ -67 +67 @@
   pb->setAbsCoor2D(50, 50);
 
-  OrxGui::GLGuiCursor* cursor = new OrxGui::GLGuiCursor();
-  cursor->show();
+  OrxGui::GLGuiHandler::getInstance()->activateCursor();
 
   if (root != NULL)
@@ -315 +314 @@
   GameWorld::tick();
 
+  // Make the GLGui tick.
+  OrxGui::GLGuiHandler::getInstance()->tick(this->dtS);
+
   this->animateScene(this->dtS);
 }