Changeset 8004 in orxonox.OLD

Timestamp:

May 31, 2006, 12:35:02 AM (18 years ago)

Author:

bensch

Message:

gui: box works pretty good now

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui_box.cc (modified) (2 diffs)
• story_entities/simple_game_menu.cc (modified) (2 diffs)

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

@@ -103 +103 @@
   void GLGuiBox::resize()
   {
-    float height = 0.0f;
+    float height = this->borderSize();
     float width = 0.0f;
     std::vector<GLGuiWidget*>::iterator widget;
@@ -110 +110 @@
     for (widget = this->children.begin(); widget != this->children.end(); ++widget)
     {
-      (*widget)->setAbsCoor2D(0, height);
+      (*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);
     GLGuiWidget::resize();
     // resize everything.

branches/gui/src/story_entities/simple_game_menu.cc

@@ -90 +90 @@
     ///
     OrxGui::GLGuiButton* dnpb = new OrxGui::GLGuiCheckButton("Push the button");
-    dnpb->show();
-    dnpb->setAbsCoor2D(350, 50);
 
     box->pack(dnpb);
 
     OrxGui::GLGuiPushButton* rdnpb = new OrxGui::GLGuiPushButton("Quit ORXONOX!!");
-    rdnpb->show();
-    rdnpb->setAbsCoor2D(200, 180);
     rdnpb->connect(SIGNAL(rdnpb, released), this, SLOT(SimpleGameMenu, quitMenu));
 
@@ -105 +101 @@
     input->setText("input some text here");
     input->connect(SIGNAL(input, textChanged), this, SLOT(SimpleGameMenu, TEST));
-    input->show();
-    input->setAbsCoor2D(200, 230);
     box->pack(input);
 
     OrxGui::GLGuiSlider* slider = new OrxGui::GLGuiSlider();
     slider->connect(SIGNAL(slider, valueChanged), this, SLOT(SimpleGameMenu, TEST));
-    slider->connect(SIGNAL(slider, valueChanged), dnpb, SLOT(OrxGui::GLGuiWidget, setBackgroundColor));
+    slider->connect(SIGNAL(slider, valueChanged), box, SLOT(OrxGui::GLGuiWidget, setBackgroundColor));
     slider->setRange(0, 1);
     slider->setValue(slider->min());
-    slider->show();
-    slider->setAbsCoor2D(200, 270);
     box->pack(slider);
   }
   box->setAbsCoor2D(50, 200);
+  box->showAll();
   /////
 }