Changeset 8017 in orxonox.OLD

Timestamp:

May 31, 2006, 11:17:33 AM (18 years ago)

Author:

bensch

Message:

gui: Vertical/Horizontral Box

Location:

branches/gui/src/lib/gui/gl_gui

Files:

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

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

@@ -62 +62 @@
     std::vector<GLGuiWidget*>::iterator delWidget = std::find(this->children.begin(), this->children.end(), widget);
     if (delWidget != this->children.end())
+    {
+      (*delWidget)->setParentWidget(NULL);
       this->children.erase(delWidget);
+    }
+    this->resize();
   }
 
@@ -103 +107 @@
   void GLGuiBox::resize()
   {
-    float height = this->borderSize();
-    float width = 0.0f;
-    std::vector<GLGuiWidget*>::iterator widget;
+    if (orientation() == OrxGui::Vertical)
+    {
+      float height = this->borderSize();
+      float width = 0.0f;
+      std::vector<GLGuiWidget*>::iterator widget;
 
-    // find out how big the Widgets are.
-    for (widget = this->children.begin(); widget != this->children.end(); ++widget)
+      // find out how big the Widgets are.
+      for (widget = this->children.begin(); widget != this->children.end(); ++widget)
+      {
+        (*widget)->setRelCoor2D(this->borderSize(), height);
+        height += (*widget)->getSizeY2D();
+        width = fmax(width, (*widget)->getSizeX2D());
+      }
+
+      width += this->borderSize() * 2.0;
+      height += this->borderSize(); /* *2 done further up */
+
+      printf("%f %f\n", width, height);
+      this->setSize2D(width, height);
+    }
+    else
     {
-      (*widget)->setRelCoor2D(this->borderSize(), height);
-      height += (*widget)->getSizeY2D();
-      width = fmax(width, (*widget)->getSizeX2D());
+      float height = this->borderSize();
+      float width = this->borderSize();
+      std::vector<GLGuiWidget*>::iterator widget;
+
+      // find out how big the Widgets are.
+      for (widget = this->children.begin(); widget != this->children.end(); ++widget)
+      {
+        (*widget)->setRelCoor2D(width, this->borderSize());
+        height = fmax(height, (*widget)->getSizeY2D());
+        width += (*widget)->getSizeX2D();
+      }
+
+      width += this->borderSize() ;
+      height += this->borderSize(); /* *2 done further up */
+
+      printf("%f %f\n", width, height);
+      this->setSize2D(width, height);
     }
+    GLGuiWidget::resize();
 
-    width += this->borderSize() * 2.0;
-    height += this->borderSize(); /* *2 done further up */
-
-    printf("%f %f\n", width, height);
-    this->setSize2D(width, height);
-    GLGuiWidget::resize();
     // resize everything.
     //for (widget = this->children.begin(); widget != this->children.end(); ++widget)

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

@@ -21 +21 @@
 
   public:
-    GLGuiBox(OrxGui::Orientation orientation = OrxGui::Horizontal);
+    GLGuiBox(OrxGui::Orientation orientation = OrxGui::Vertical);
     virtual ~GLGuiBox();
 
     /** @returns the Orientation of the Box */
     OrxGui::Orientation orientation() const { return this->_orientation; };
+    /** @param orientation the Orientation of the Box */
     void setOrientation(OrxGui::Orientation orientation) { this->_orientation = orientation; };