Changeset 8421 in orxonox.OLD for branches

Timestamp:

Jun 14, 2006, 11:32:14 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more widgets updated

Location:

branches/gui/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• gui/gl/glgui_inputline.cc (modified) (1 diff)
• gui/gl/glgui_slider.cc (modified) (3 diffs)
• gui/gl/glgui_slider.h (modified) (2 diffs)
• math/rect2D.cc (modified) (1 diff)
• math/rect2D.h (modified) (1 diff)

branches/gui/src/lib/event/event_handler.cc

@@ -355 +355 @@
   else
   {
-    SDL_WM_GrabInput(SDL_GRAB_ON);
+//    SDL_WM_GrabInput(SDL_GRAB_ON);
     SDL_ShowCursor(SDL_DISABLE);
   }

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

@@ -154 +154 @@
       }
     }
-
     return false;
   }

branches/gui/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()
+  {
+
   }
 
@@ -228 +238 @@
     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();

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

@@ -56 +56 @@
   protected:
     virtual void resize();
+    virtual void updateFrontColor();
 
     virtual void clicking(const Vector2D& pos);
@@ -68 +69 @@
   private:
     Orientation      orientation;
+
+    Rect2D           _slider;
+    Rect2D           _handle;
 
     float            _maxValue;

branches/gui/src/lib/math/rect2D.cc

@@ -232 +232 @@
 
 /**
+ * @brief sets the new Center
+ * @param x the center's X to move the Rectangle to.
+ * @param y the center's Y to move the Rectangle to.
+ * moves the Rectangle from its current center to the new Center
+ */
+void Rect2D::setCenter(float x, float y)
+{
+  this->setCenter(Vector2D(x, y));
+}
+
+/**
+ * @brief sets the new Center
+ * @param center the center to move the Rectangle to.
+ * moves the Rectangle from its current center to the new Center
+ */
+void Rect2D::setCenterX(float x)
+{
+#warning implement this
+}
+
+/**
+ * @brief sets the new Center
+ * @param center the center to move the Rectangle to.
+ * moves the Rectangle from its current center to the new Center
+ */
+void Rect2D::setCenterY(float y)
+{
+#warning implement this
+}
+
+/**
  * @brief scales the Rectangle from topLeft out.
  * @param x: the scale factor in x direction

branches/gui/src/lib/math/rect2D.h

@@ -96 +96 @@
   void setSize(const Vector2D& size);
   void setCenter(const Vector2D& center);
+  void setCenter(float x, float y);
+  void setCenterX(float x);
+  void setCenterY(float y);
+
 
   void scaleX(float x);