Changeset 8672 in orxonox.OLD

Timestamp:

Jun 21, 2006, 2:59:55 PM (18 years ago)

Author:

bensch

Message:

selectables

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_button.cc (modified) (1 diff)
• glgui_handler.cc (modified) (4 diffs)
• glgui_inputline.cc (modified) (1 diff)
• glgui_slider.cc (modified) (1 diff)
• glgui_widget.cc (modified) (1 diff)

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

@@ -51 +51 @@
   {
     this->setClassID(CL_GLGUI_BUTTON, "GLGuiButton");
+
+    this->setSelectable(true);
     this->setFocusable(true);
     this->setClickable(true);

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

@@ -24 +24 @@
 #include "class_list.h"
 
+#include "debug.h"
+
 #include <cassert>
 
@@ -100 +102 @@
   void GLGuiHandler::selectNext()
   {
+    printf("searching next Widget\n");
+    // retrieve Objects.
     const std::list<BaseObject*>* objects = ClassList::getList(CL_GLGUI_WIDGET);
+
     if (objects)
     {
       std::list<BaseObject*>::const_iterator it ;
-      std::list<BaseObject*>::const_iterator currentIt = objects->begin();
+      std::list<BaseObject*>::const_iterator currentIt = objects->end();
 
       if (GLGuiWidget::selected() != NULL)
       {
-
         it = std::find(objects->begin(), objects->end(), GLGuiWidget::selected());
         if (it != objects->end())
@@ -115 +119 @@
           it++;
         }
-        if (it == objects->end())
+      }
+      else
+      {
+        it = objects->begin();
+      }
+
+      bool cycledOnce = false;
+
+      for (; it != currentIt; ++it)
+      {
+        if (it == objects->end() && !cycledOnce)
+        {
           it = objects->begin();
-      }
-      else
-      {
-        it = objects->begin();
-      }
-
-      for (; it != objects->end() && currentIt != it; ++it)
-      {
+          cycledOnce = true;
+        }
+
         if (dynamic_cast<GLGuiWidget*>(*it)->selectable())
         {
@@ -132 +142 @@
       }
 
+    }
+    else
+    {
+      PRINTF(0)("NO GUI-ELEMENTS EXISTING\n");
     }
   }

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

@@ -48 +48 @@
     this->setFocusable(true);
     this->setClickable(true);
+    this->setSelectable(true);
 
     this->_clearOnEnter = false;

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

@@ -48 +48 @@
     this->setClassID(CL_GLGUI_SLIDER, "GLGuiSlider");
 
-    this->setClickable( );
-    this->setFocusable( );
+    this->setClickable(true);
+    this->setFocusable(true);
+    this->setSelectable(true);
 
     this->_value = 0.0;

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

@@ -93 +93 @@
     this->_focusable = false;
     this->_clickable = false;
+    this->_selectable = false;
     this->_pushed = false;
     this->_state = OrxGui::Normal;
-    this->_pushed = false;