Changeset 8448 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_pushbutton.cc

Timestamp:

Jun 15, 2006, 12:48:26 PM (18 years ago)

Author:

bensch

Message:

merged gui back to the trunk
merged with command
merge -r8377:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .

File:

• trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified) (2 diffs)

trunk/src/lib/gui/gl/glgui_pushbutton.cc

@@ -45 +45 @@
   void GLGuiPushButton::resize()
   {
-    this->labelText().setRelCoor2D(borderLeft() + 5, borderTop() + 5);
-    this->setSize2D(this->labelText().getSizeX2D() + 10 + borderLeft()+borderRight(), this->labelText().getSizeY2D() + 10 + borderTop() + borderBottom() );
+    this->labelText().setRelCoor2D(borderLeft(), borderTop());
+    this->setSize2D(this->labelText().getSizeX2D() + borderLeft() + borderRight(), this->labelText().getSizeY2D() + borderTop() + borderBottom() );
 
     GLGuiWidget::resize();
-    this->frontRect().setTopLeft(borderLeft(), borderTop());
-    this->frontRect().setSize(this->getSizeX2D() - (borderLeft() + borderRight()), this->getSizeY2D() - (borderTop() + borderBottom()));
+/*    this->frontRect().setTopLeft(borderLeft(), borderTop());
+    this->frontRect().setSize(this->getSizeX2D() - (borderLeft() + borderRight()), this->getSizeY2D() - (borderTop() + borderBottom()));*/
   }
 
@@ -97 +97 @@
     GLGuiButton::draw();
 
-    this->frontMaterial().select();
-    this->drawRect(this->frontRect());
     this->endDraw();
-    //   this->label->draw();
-    //  printf("test");
   }