Changeset 8429 in orxonox.OLD

Timestamp:

Jun 15, 2006, 12:29:58 AM (18 years ago)

Author:

bensch

Message:

orxonox/gui: better draw to CheckButton

Location:

branches/gui/src/lib/gui/gl

Files:

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

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

@@ -65 +65 @@
   void GLGuiCheckButton::resize()
   {
-    this->labelText().setRelCoor2D(borderLeft() + 25, borderTop() + 5);
-    this->setSize2D(this->labelText().getSizeX2D() + 30 + borderLeft() + borderRight(), this->labelText().getSizeY2D() + 10 + borderTop()+borderBottom());
+
+    this->labelText().setRelCoor2D( borderLeft() + 15.0, borderTop() + 5);
+    this->setSize2D(this->labelText().getSizeX2D() + 15.0 + borderLeft() + borderRight(), this->labelText().getSizeY2D() + 10 + borderTop()+borderBottom());
     GLGuiWidget::resize();
+
+    this->_checkBox.setSize(10.0, 10.0);
+    this->_checkBox.setCenter( borderLeft() + _checkBox.height()/2.0, borderTop() + (this->getSizeY2D() - borderTop() - borderBottom()) / 2.0);
+
 /*    this->frontRect().setTopLeft(borderLeft(), borderTop());
     this->frontRect().setSize(this->getSizeX2D() - (borderLeft() + borderRight()) , this->getSizeY2D() - (borderTop() + borderBottom()));*/
@@ -94 +99 @@
     if (this->bActive)
     {
-      glBegin(GL_QUADS);
-      glColor3f( 1, 1 ,1);
-      glTexCoord2i(0,0); glVertex2d(borderLeft()+8, borderTop()+8);
-      glTexCoord2i(0,1); glVertex2d(borderLeft() + 8, this->getSizeY2D()-8 - (borderTop() + borderBottom()));
-      glTexCoord2i(1,1); glVertex2d(this->getSizeY2D()-8 +borderLeft(), this->getSizeY2D()-8- (borderTop() + borderBottom()));
-      glTexCoord2i(1,0); glVertex2d(this->getSizeY2D()-8 +borderLeft(), borderTop()+8);
-      glEnd();
+      glColor3fv( &this->frontColor()[0]);
+      this->drawRect(this->_checkBox);
 
 
       // DRAW a cross :)
-      glColor3f(0,0,0);
+      Vector2D center = this->_checkBox.center();
+      glColor4f(1,1,1, 1.0);
       glLineWidth(3.0);
+
       glBegin(GL_LINE_LOOP);
-      glVertex2d(borderLeft()+8,borderTop() +8);
-      glVertex2d(this->getSizeY2D()/2 + borderLeft(), this->getSizeY2D()/2 - 1);
+      glVertex2d(_checkBox.left(), _checkBox.top());
+      glVertex2d(center.x, center.y);
 
-      glVertex2d(this->getSizeY2D()-8 + borderLeft(), borderTop()+8);
-      glVertex2d(this->getSizeY2D()/2 +1 + borderLeft(), this->getSizeY2D()/2);
+      glVertex2d(_checkBox.right(), _checkBox.top());
+      glVertex2d(center.x, center.y);
 
-      glVertex2d(this->getSizeY2D()-8 + borderLeft(), this->getSizeY2D()-8- (borderTop() + borderBottom()));
-      glVertex2d(this->getSizeY2D()/2 + borderLeft(), this->getSizeY2D()/2+1);
+      glVertex2d(_checkBox.right(), _checkBox.bottom());
+      glVertex2d(center.x, center.y);
 
-      glVertex2d(borderLeft() + 8, this->getSizeY2D()-8 - (borderTop() + borderBottom()));
-      glVertex2d(this->getSizeY2D()/2 -1 + borderLeft(), this->getSizeY2D()/2);
+      glVertex2d(_checkBox.left(), _checkBox.bottom());
+      glVertex2d(center.x, center.y);
       glEnd();
     }
     else
     {
-      glBegin(GL_QUADS);
-      glColor3f(0, 0, 0);
-      glTexCoord2i(0,0); glVertex2d(borderLeft()+8, borderTop()+8);
-      glTexCoord2i(0,1); glVertex2d(borderLeft()+ 8, this->getSizeY2D()-8 - (borderTop() + borderBottom()));
-      glTexCoord2i(1,1); glVertex2d(this->getSizeY2D()-8 +borderLeft(), this->getSizeY2D()-8- (borderTop() + borderBottom()));
-      glTexCoord2i(1,0); glVertex2d(this->getSizeY2D()-8 +borderLeft(), borderTop()+8);
-      glEnd();
+      glColor3fv( &this->frontColor()[0]);
+      this->drawRect(this->_checkBox);
     }
 

branches/gui/src/lib/gui/gl/glgui_checkbutton.h

@@ -46 +46 @@
   private:
     bool             bActive;
-
+    Rect2D           _checkBox;
   };
 }