Changeset 7926 in orxonox.OLD for branches

Timestamp:

May 28, 2006, 6:01:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/gui: all widgets correct again

Location:

branches/gui/src/lib/gui/gl_gui

Files:

• glgui_inputline.cc (modified) (3 diffs)
• glgui_pushbutton.cc (modified) (1 diff)

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

@@ -129 +129 @@
   {
     this->setSize2D( this->text.getSize2D() + Vector2D(8, 8));
+    GLGuiWidget::resize();
+    this->frontRect().setTopLeft(1,1);
+    this->frontRect().setSize(this->getSize2D() - Vector2D(2,2));
   }
 
@@ -156 +159 @@
 
   /**
-   * draws the GLGuiInputLine
+   * @brief draws the GLGuiInputLine
    */
   void GLGuiInputLine::draw() const
@@ -164 +167 @@
 
     this->frontMaterial().select();
-    glBegin(GL_QUADS);
+    GLGuiWidget::drawRect(this->frontRect());
 
-    glTexCoord2i(0,0); glVertex2d(3, 3);
-    glTexCoord2i(0,1); glVertex2d(3, this->getSizeY2D() - 3);
-    glTexCoord2i(1,1); glVertex2d(this->getSizeX2D() - 3, this->getSizeY2D() -3);
-    glTexCoord2i(1,0); glVertex2d(this->getSizeX2D() - 3, 3);
-
-    glEnd();
     this->endDraw();
   }

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

@@ -45 +45 @@
   void GLGuiPushButton::resize()
   {
-    this->label.setRelCoor2D(25, 5);
+    this->label.setRelCoor2D(5, 5);
     this->setSize2D(this->label.getSizeX2D() + 10, this->label.getSizeY2D() + 10);
+
     GLGuiWidget::resize();
     this->frontRect().setTopLeft(1, 1);