Changeset 8035 in orxonox.OLD for trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc

Timestamp:

May 31, 2006, 4:20:51 PM (18 years ago)

Author:

bensch

Message:

gui: merged the gui back to the trunk

File:

• trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc (modified) (3 diffs)

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

@@ -47 +47 @@
     this->label.setRelCoor2D(5, 5);
     this->setSize2D(this->label.getSizeX2D() + 10, this->label.getSizeY2D() + 10);
+
+    GLGuiWidget::resize();
+    this->frontRect().setTopLeft(1, 1);
+    this->frontRect().setSize(this->getSizeX2D() -2, this->getSizeY2D() -2);
   }
 
@@ -70 +74 @@
   }
 
-  void GLGuiPushButton::clicked()
+  void GLGuiPushButton::clicking(const Vector2D& pos)
   {
     printf("%s clicked\n", this->getLabel().c_str());
-    GLGuiWidget::clicked();
+    GLGuiButton::clicking(pos);
   }
 
 
-  void GLGuiPushButton::released()
+  void GLGuiPushButton::releasing(const Vector2D& pos)
   {
     printf("%s released\n", this->getLabel().c_str());
-    GLGuiWidget::released();
+    GLGuiButton::releasing(pos);
   }
 
@@ -90 +94 @@
   void GLGuiPushButton::draw() const
   {
-    this->startDraw();
+    this->beginDraw();
     GLGuiButton::draw();
 
     this->frontMaterial().select();
-    glBegin(GL_QUADS);
-
-    glTexCoord2i(0,0); glVertex2d(1, 1);
-    glTexCoord2i(0,1); glVertex2d(1, this->getSizeY2D() - 1);
-    glTexCoord2i(1,1); glVertex2d(this->getSizeX2D() - 1, this->getSizeY2D() -1);
-    glTexCoord2i(1,0); glVertex2d(this->getSizeX2D() - 1, 1);
-
-    glEnd();
+    this->drawRect(this->frontRect());
     this->endDraw();
     //   this->label->draw();