Changeset 9621 in orxonox.OLD

Timestamp:

Jul 30, 2006, 10:06:46 PM (18 years ago)

Author:

bensch

Message:

better packing modularity in the Box

Location:

branches/proxy/src/lib/gui/gl

Files:

• glgui_box.cc (modified) (2 diffs)
• glgui_box.h (modified) (2 diffs)

branches/proxy/src/lib/gui/gl/glgui_box.cc

@@ -18 +18 @@
 #include "glgui_box.h"
 #include <cassert>
+#include "debug.h"
 
 namespace OrxGui
@@ -57 +58 @@
   {
     assert (widget != NULL);
-
     this->_children.push_back(widget);
+
+    this->packing(widget);
+  }
+
+
+  void GLGuiBox::pack(GLGuiWidget* widget, std::list<GLGuiWidget*>::iterator pos)
+  {
+    this->_children.insert(pos, widget);
+    this->packing(widget);
+  }
+
+  void GLGuiBox::pack(GLGuiWidget* widget, unsigned int position)
+  {
+    if (this->_children.empty())
+      this->pack(widget);
+
+    unsigned int pos = 0;
+    std::list<GLGuiWidget*>::iterator it = this->_children.begin();
+
+    for (; pos < position; ++pos)
+    {
+      if (this->_children.end() == ++it)
+      {
+        PRINTF(2)("Reached end of packing list, without getting to the designated position %d (i am at %d)\n", position, pos);
+        this->pack(widget);
+      }
+    }
+    this->_children.insert(it, widget);
+    this->packing(widget);
+  }
+
+  void GLGuiBox::pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer)
+  {
+    assert (widget != NULL && widgetPointer != NULL);
+
+    std::list<GLGuiWidget*>::iterator it = this->_children.begin();
+    for (; it != this->_children.end(); ++it)
+    {
+      if (widgetPointer == *it)
+      {
+        this->_children.insert(it, widget);
+        return;
+      }
+    }
+    PRINTF(2)("WidgetPointer %p not found, inserting at the end\n", widgetPointer);
+    this->pack(widget);
+    this->packing(widget);
+  }
+
+  void GLGuiBox::packFront(GLGuiWidget* widget)
+  {
+    this->_children.push_front(widget);
+    this->packing(widget);
+  }
+
+  void GLGuiBox::packBack(GLGuiWidget* widget)
+  {
+    this->pack(widget);
+  }
+
+  void GLGuiBox::packing(GLGuiWidget* widget)
+  {
     widget->setParentWidget(this);
-
     this->resize();
   }
-
 
   void GLGuiBox::unpack(GLGuiWidget* widget)

branches/proxy/src/lib/gui/gl/glgui_box.h

@@ -30 +30 @@
 
     virtual void pack(GLGuiWidget* widget);
-    void pack(GLGuiWidget* widget, std::list<GLGuiWidget*>::iterator pos);
     void pack(GLGuiWidget* widget, unsigned int position);
-    //void
+    void pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer);
+    void packFront(GLGuiWidget* widget);
+    void packBack(GLGuiWidget* widget);
     virtual void unpack(GLGuiWidget* widget);
+
     virtual void clear();
 
@@ -46 +48 @@
   private:
     void init();
+    void packing(GLGuiWidget* widget); // the action executing when packing a widget.
+    void pack(GLGuiWidget* widget, std::list<GLGuiWidget*>::iterator pos);
+
+  private:
+
 
     Orientation                _orientation;