Changeset 8448 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_slider.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_slider.cc (modified) (4 diffs)

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

@@ -74 +74 @@
     else
       this->_value = value;
+    this->_handle.setCenter(this->sliderPosition(), this->borderTop() + (this->getSizeY2D() - this->borderTop() - borderBottom()) / 2.0);
+
     emit(valueChanged(this->_value));
   }
@@ -161 +163 @@
   {
     GLGuiWidget::resize();
-    this->frontRect().setTopLeft(this->borderLeft(), this->getSizeY2D()/2.0 - 2.0);
-    this->frontRect().setSize(this->getSizeX2D() - borderLeft() - borderRight(), 4.0);
+//    this->frontRect().setTopLeft(this->borderLeft(), this->getSizeY2D()/2.0 - 2.0);
+//    this->frontRect().setSize(this->getSizeX2D() - borderLeft() - borderRight(), 4.0);
+    this->_slider.setTopLeft(this->borderLeft(), this->getSizeY2D() / 2.0 -2.0);
+    this->_slider.setSize(this->getSizeX2D() - borderLeft() - borderRight(), 4.0);
+    this->_handle.setSize(this->_sliderWidth, this->getSizeY2D() - borderTop() - borderBottom());
+  }
+
+  void GLGuiSlider::updateFrontColor()
+  {
+
   }
 
@@ -218 +228 @@
   void GLGuiSlider::tick(float dt)
   {
+    GLGuiWidget::tick(dt);
   }
 
@@ -228 +239 @@
     GLGuiWidget::draw();
 
-    this->frontMaterial().select();
-    this->drawRect(this->frontRect());
-
-    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, 0*this->borderTop(), _sliderWidth, this->getSizeY2D() - (borderTop() + borderBottom()) ));
+    glColor4fv(&this->frontColor()[0]);
+    this->drawRect(this->_slider);
+    this->drawRect(this->_handle);
+    //this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, 0*this->borderTop(), _sliderWidth, this->getSizeY2D() - (borderTop() + borderBottom()) ));
 
     this->endDraw();