Changeset 8016 in orxonox.OLD

Timestamp:

May 31, 2006, 11:09:27 AM (18 years ago)

Author:

bensch

Message:

box scales with its children

Location:

branches/gui/src

Files:

• lib/graphics/importer/model.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_box.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.cc (modified) (3 diffs)
• lib/gui/gl_gui/glgui_widget.h (modified) (4 diffs)
• lib/lang/base_object.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)

branches/gui/src/lib/graphics/importer/model.h

@@ -25 +25 @@
 #include "base_object.h"
 #include "vector.h"
-
-using namespace std;
 
 

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

@@ -50 +50 @@
 
     this->children.push_back(widget);
-    this->addChild2D(widget);
+    widget->setParentWidget(this);
 
     this->resize();

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

@@ -34 +34 @@
     this->init();
 
-    if (parent != NULL)
-      parent->addChild2D(this);
+    this->setParentWidget(parent);
   }
 
@@ -72 +71 @@
   }
 
+
+  void GLGuiWidget::setParentWidget(GLGuiWidget* parent)
+  {
+    this->_parent = parent;
+
+    if (parent != NULL)
+      parent->addChild2D(this);
+  }
 
   /** @brief gives focus to this widget */
@@ -115 +122 @@
   {
     this->backRect().setSize(this->getSize2D());
+    if (this->parent() != NULL)
+      this->parent()->resize();
   }
 

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

@@ -44 +44 @@
 
 
+    void setParentWidget(GLGuiWidget* parent);
+    GLGuiWidget* parent() const { return this->_parent; }
+
     /// FOCUS
     /** @brief gives focus to this widget */
@@ -59 +62 @@
     /** @returns the currently focused Widget (NULL if none is selected) */
     static GLGuiWidget* focused() { return GLGuiWidget::_focused; };
-
 
 
@@ -132 +134 @@
 
   private:
+    GLGuiWidget*                   _parent;           //!< The parent of this Widget.
+
     /// LOOKS
     Material                       _backMat;
@@ -147 +151 @@
     bool                           _pushed;
 
+
     static GLGuiWidget*            _selected;         //!< The currently selected Widget.
     static GLGuiWidget*            _focused;          //!< The currently Focused Widget.

branches/gui/src/lib/lang/base_object.h

@@ -12 +12 @@
 #include "class_id.h"
 #include "debug.h"
-#ifndef NULL
-#define NULL     0    //!< NULL
-#endif
+#include <string>
 
-#include <string>
 #include "stdincl.h"
 

branches/gui/src/story_entities/simple_game_menu.cc

@@ -117 +117 @@
   OrxGui::GLGuiBox* imageSelector = new OrxGui::GLGuiBox();
   {
-
     image = new OrxGui::GLGuiImage();
-    image->setWidgetSize(200, 200);
+    image->setWidgetSize(300, 300);
     image->setAbsCoor2D(300, 300);
     imageSelector->pack(image);