Changeset 8116 in orxonox.OLD for branches

Timestamp:

Jun 2, 2006, 11:20:38 AM (18 years ago)

Author:

bensch

Message:

gui: borders should work… testing

Location:

branches/gui/src/lib/gui/gl_gui

Files:

• glgui_checkbutton.cc (modified) (1 diff)
• glgui_inputline.cc (modified) (2 diffs)
• glgui_inputline.h (modified) (1 diff)
• glgui_pushbutton.cc (modified) (1 diff)
• glgui_widget.cc (modified) (1 diff)

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

@@ -65 +65 @@
   void GLGuiCheckButton::resize()
   {
-    this->labelText().setRelCoor2D(25, 5);
-    this->setSize2D(this->labelText().getSizeX2D() + 30, this->labelText().getSizeY2D() + 10);
+    this->labelText().setRelCoor2D(borderLeft() + 25, borderTop() + 5);
+    this->setSize2D(this->labelText().getSizeX2D() + 30 + borderLeft() + borderRight(), this->labelText().getSizeY2D() + 10 + borderTop()+borderBottom());
     GLGuiWidget::resize();
     this->frontRect().setTopLeft(borderLeft(), borderTop());

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

@@ -51 +51 @@
     this->text.setRelCoor2D(4,4);
     this->text.setFont("fonts/final_frontier.ttf", 20);
-    this->resize();
+    this->text.setVisibility(false);
+    this->resize();
+
   }
 
@@ -162 +164 @@
   void GLGuiInputLine::resize()
   {
-    this->setSize2D( this->text.getSize2D() + Vector2D(8, 8));
+    this->text.setRelCoor2D(this->borderLeft() + 2.0,this->borderTop() + 2.0);
+    this->setSize2D( this->text.getSize2D() + Vector2D(borderLeft() + borderRight() + 4.0, borderTop() + borderBottom() + 4.0));
     GLGuiWidget::resize();
     this->frontRect().setTopLeft(borderLeft(), borderTop());
-    this->frontRect().setSize(this->getSize2D() - Vector2D(borderRight(), borderBottom()));
+    this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));
+  }
+
+
+  void GLGuiInputLine::hiding()
+  {
+    this->text.setVisibility(false);
+  }
+
+  void GLGuiInputLine::showing()
+  {
+    this->text.setVisibility(true);
   }
 

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

@@ -51 +51 @@
     void init();
     void resize();
+    virtual void hiding();
+    virtual void showing();
 
   private:

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

@@ -45 +45 @@
   void GLGuiPushButton::resize()
   {
-    this->labelText().setRelCoor2D(5, 5);
-    this->setSize2D(this->labelText().getSizeX2D() + 10, this->labelText().getSizeY2D() + 10);
+    this->labelText().setRelCoor2D(borderLeft() + 5, borderTop() + 5);
+    this->setSize2D(this->labelText().getSizeX2D() + 10 + borderLeft()+borderRight(), this->labelText().getSizeY2D() + 10 + borderTop() + borderBottom() );
 
     GLGuiWidget::resize();
-    this->frontRect().setTopLeft(1, 1);
-    this->frontRect().setSize(this->getSizeX2D() -2, this->getSizeY2D() -2);
+    this->frontRect().setTopLeft(borderLeft(), borderRight());
+    this->frontRect().setSize(this->getSizeX2D() - (borderLeft() + borderRight()), this->getSizeY2D() - (borderTop() + borderBottom()));
   }
 

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

@@ -69 +69 @@
     this->_frontMat.setDiffuse(1.0, 0.0, 0.0);
 
-    this->_borderLeft = 1.0;
+    this->_borderLeft = 10.0;
     this->_borderRight = 1.0;
     this->_borderTop = 1.0;