Changeset 8117 in orxonox.OLD for branches

Timestamp:

Jun 2, 2006, 11:50:17 AM (18 years ago)

Author:

bensch

Message:

gui: pretty good borders

Location:

branches/gui/src/lib/gui/gl_gui

Files:

• glgui_checkbutton.cc (modified) (3 diffs)
• glgui_image.cc (modified) (1 diff)
• glgui_pushbutton.cc (modified) (1 diff)
• glgui_slider.cc (modified) (1 diff)
• glgui_widget.cc (modified) (1 diff)

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

@@ -96 +96 @@
       glBegin(GL_QUADS);
       glColor3f( 1, 1 ,1);
-      glTexCoord2i(0,0); glVertex2d(8, 8);
-      glTexCoord2i(0,1); glVertex2d(8, this->getSizeY2D()-8);
-      glTexCoord2i(1,1); glVertex2d(this->getSizeY2D()-8, this->getSizeY2D()-8);
-      glTexCoord2i(1,0); glVertex2d(this->getSizeY2D()-8, 8);
+      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();
 
@@ -107 +107 @@
       glLineWidth(3.0);
       glBegin(GL_LINE_LOOP);
-      glVertex2d(8,8);
-      glVertex2d(this->getSizeY2D()/2, this->getSizeY2D()/2 - 1);
+      glVertex2d(borderLeft()+8,borderTop() +8);
+      glVertex2d(this->getSizeY2D()/2 + borderLeft(), this->getSizeY2D()/2 - 1);
 
-      glVertex2d(this->getSizeY2D() -8, 8);
-      glVertex2d(this->getSizeY2D()/2 +1, this->getSizeY2D()/2);
+      glVertex2d(this->getSizeY2D()-8 + borderLeft(), borderTop()+8);
+      glVertex2d(this->getSizeY2D()/2 +1 + borderLeft(), this->getSizeY2D()/2);
 
-      glVertex2d(this->getSizeY2D() -8, this->getSizeY2D() - 8);
-      glVertex2d(this->getSizeY2D()/2, this->getSizeY2D()/2+1);
+      glVertex2d(this->getSizeY2D()-8 + borderLeft(), this->getSizeY2D()-8- (borderTop() + borderBottom()));
+      glVertex2d(this->getSizeY2D()/2 + borderLeft(), this->getSizeY2D()/2+1);
 
-      glVertex2d(8, this->getSizeY2D() - 8);
-      glVertex2d(this->getSizeY2D()/2 -1, this->getSizeY2D()/2);
+      glVertex2d(borderLeft() + 8, this->getSizeY2D()-8 - (borderTop() + borderBottom()));
+      glVertex2d(this->getSizeY2D()/2 -1 + borderLeft(), this->getSizeY2D()/2);
       glEnd();
     }
@@ -124 +124 @@
       glBegin(GL_QUADS);
       glColor3f(0, 0, 0);
-      glTexCoord2i(0,0); glVertex2d(8, 8);
-      glTexCoord2i(0,1); glVertex2d(8, this->getSizeY2D()-8);
-      glTexCoord2i(1,1); glVertex2d(this->getSizeY2D()-8, this->getSizeY2D()-8);
-      glTexCoord2i(1,0); glVertex2d(this->getSizeY2D()-8, 8);
+      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();
     }

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

@@ -75 +75 @@
   void GLGuiImage::resize()
   {
-    this->frontRect().setTopLeft(this->borderLeft(), this->borderRight());
+    this->frontRect().setTopLeft(this->borderLeft(), this->borderTop());
     this->frontRect().setSize(this->getSizeX2D() - (borderLeft() + borderRight()), this->getSizeY2D() - (borderTop() + borderBottom()) );
     GLGuiWidget::resize();

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

@@ -49 +49 @@
 
     GLGuiWidget::resize();
-    this->frontRect().setTopLeft(borderLeft(), borderRight());
+    this->frontRect().setTopLeft(borderLeft(), borderTop());
     this->frontRect().setSize(this->getSizeX2D() - (borderLeft() + borderRight()), this->getSizeY2D() - (borderTop() + borderBottom()));
   }

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

@@ -231 +231 @@
     this->drawRect(this->frontRect());
 
-    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, borderLeft(), _sliderWidth, this->getSizeY2D() - (borderLeft() + borderRight())));
+    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, borderTop(), _sliderWidth, this->getSizeY2D() - (borderTop() + borderBottom())));
 
     this->endDraw();

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

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