Changeset 7936 in orxonox.OLD

Timestamp:

May 28, 2006, 10:16:49 PM (18 years ago)

Author:

bensch

Message:

gui: new parameter borderSize

Location:

branches/gui/src/lib/gui/gl_gui

Files:

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

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

@@ -63 +63 @@
     this->setSize2D(this->label.getSizeX2D() + 30, this->label.getSizeY2D() + 10);
     GLGuiWidget::resize();
-    this->frontRect().setTopLeft(1, 1);
-    this->frontRect().setSize(this->getSizeX2D() -2, this->getSizeY2D() -2);
+    this->frontRect().setTopLeft(borderSize(), borderSize());
+    this->frontRect().setSize(this->getSizeX2D() -2.0*borderSize(), this->getSizeY2D() -2.0*borderSize());
   }
 

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

@@ -130 +130 @@
     this->setSize2D( this->text.getSize2D() + Vector2D(8, 8));
     GLGuiWidget::resize();
-    this->frontRect().setTopLeft(1,1);
-    this->frontRect().setSize(this->getSize2D() - Vector2D(2,2));
+    this->frontRect().setTopLeft(borderSize(), borderSize());
+    this->frontRect().setSize(this->getSize2D() - Vector2D(borderSize(), borderSize()));
   }
 

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

@@ -112 +112 @@
   {
     GLGuiWidget::resize();
-    this->frontRect().setTopLeft(5, this->getSizeY2D()/2.0 - 1.0);
-    this->frontRect().setSize(this->getSizeX2D() - 10.0, 5);
+    this->frontRect().setTopLeft(5, this->getSizeY2D()/2.0 - borderSize());
+    this->frontRect().setSize(this->getSizeX2D() - 10.0, borderSize());
   }
 
@@ -176 +176 @@
     this->drawRect(this->frontRect());
 
-    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, 2, _sliderWidth, this->getSizeY2D() - 4));
+    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, borderSize(), _sliderWidth, this->getSizeY2D() - 2 * borderSize()));
 
     this->endDraw();

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

@@ -68 +68 @@
     this->_backMat.setDiffuse(1.0, 1.0, 1.0);
     this->_frontMat.setDiffuse(1.0, 0.0, 0.0);
+    this->_borderSize = 1.0;
 
     this->widgetSignals.resize(SignalCount, SignalConnector());
@@ -105 +106 @@
 
 
+  void GLGuiWidget::setBorderSize(float borderSize)
+  {
+    this->_borderSize = borderSize;
+    this->resize();
+  }
+
+
   void GLGuiWidget::resize()
   {

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

@@ -100 +100 @@
     const Rect2D& frontRect() const { return this->_frontRect; };
 
+    float borderSize() const { return this->_borderSize; };
+    void setBorderSize(float borderSize);
+
     inline void drawRect(const Rect2D& rect) const {
       glBegin(GL_QUADS);
@@ -150 +153 @@
     Rect2D                         _frontRect;
 
+    float                          _borderSize;
 
     /// SIGNALS