Changeset 8701 in orxonox.OLD

Timestamp:

Jun 22, 2006, 11:06:48 AM (18 years ago)

Author:

bensch

Message:

gui:better design

Location:

branches/gui/src

Files:

• lib/gui/gl/glgui_handler.cc (modified) (1 diff)
• lib/gui/gl/glgui_handler.h (modified) (1 diff)
• story_entities/Makefile.am (modified) (2 diffs)
• story_entities/menu/game_menu.cc (moved) (moved from branches/gui/src/story_entities/game_menu.cc)
• story_entities/menu/game_menu.h (moved) (moved from branches/gui/src/story_entities/game_menu.h)

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

@@ -131 +131 @@
         {
           it = objects->begin();
+          cycledOnce = true;
+        }
+
+        if (dynamic_cast<GLGuiWidget*>(*it)->selectable())
+        {
+          dynamic_cast<GLGuiWidget*>(*it)->select();
+          return;
+        }
+      }
+
+    }
+    else
+    {
+      PRINTF(0)("NO GUI-ELEMENTS EXISTING\n");
+    }
+  }
+
+  void GLGuiHandler::selectPrevious()
+  {
+    // 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();
+
+      if (GLGuiWidget::selected() != NULL)
+      {
+        it = std::find(objects->begin(), objects->end(), GLGuiWidget::selected());
+        if (it != objects->end())
+        {
+          currentIt = it;
+          it--;
+        }
+      }
+      else
+      {
+        it = objects->end();
+      }
+
+      bool cycledOnce = false;
+
+      for (; it != currentIt; --it)
+      {
+        if (it == objects->end() && !cycledOnce)
+        {
+          --it ;
           cycledOnce = true;
         }

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

@@ -35 +35 @@
 
     void selectNext();
+    void selectPrevious();
 
     void activate();

branches/gui/src/story_entities/Makefile.am

@@ -13 +13 @@
                 story_entities/multi_player_world_data.cc \
                 story_entities/movie_loader.cc \
-                story_entities/game_menu.cc \
                 story_entities/simple_game_menu.cc \
                 \
+                story_entities/menu/game_menu.cc \
                 story_entities/menu/glgui_imagebutton.cc
 
@@ -30 +30 @@
                 story_entities/multi_player_world_data.h \
                 story_entities/movie_loader.h \
-                story_entities/game_menu.h \
                 story_entities/simple_game_menu.h \
                 \
+                story_entities/menu/game_menu.h \
                 story_entities/menu/glgui_imagebutton.h