Changeset 7931 in orxonox.OLD

Timestamp:

May 28, 2006, 8:18:03 PM (18 years ago)

Author:

bensch

Message:

gui: Slider can be slided

Location:

branches/gui/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• gui/gl_gui/glgui_handler.cc (modified) (3 diffs)
• gui/gl_gui/glgui_handler.h (modified) (1 diff)
• gui/gl_gui/glgui_slider.cc (modified) (6 diffs)
• gui/gl_gui/glgui_slider.h (modified) (2 diffs)

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

@@ -380 +380 @@
       case SDL_MOUSEBUTTONUP:
         ev.bPressed = false;
+        ev.x = event.motion.x;
+        ev.y = event.motion.y;
         ev.type = event.button.button + SDLK_LAST;
         break;
       case SDL_MOUSEBUTTONDOWN:
         ev.bPressed = true;
+        ev.x = event.motion.x;
+        ev.y = event.motion.y;
         ev.type = event.button.button + SDLK_LAST;
         break;

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

@@ -108 +108 @@
             if (GLGuiWidget::focused()->clickable())
             {
-              GLGuiWidget::focused()->click(Vector2D(event.x, event.y) - GLGuiWidget::focused()->getAbsCoor2D());
+              Vector2D cursorPos = (this->cursor != NULL) ? this->cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
+              GLGuiWidget::focused()->click(cursorPos - GLGuiWidget::focused()->getAbsCoor2D());
             }
           }
@@ -114 +115 @@
           {
             if (GLGuiWidget::focused()->clickable())
-              GLGuiWidget::focused()->release(Vector2D(event.x, event.y) - GLGuiWidget::focused()->getAbsCoor2D());
+            {
+              Vector2D cursorPos = (this->cursor != NULL) ? this->cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
+              GLGuiWidget::focused()->release(cursorPos - GLGuiWidget::focused()->getAbsCoor2D());
+            }
           }
         }
@@ -139 +143 @@
 
   }
+
+
+  Vector2D GLGuiHandler::cursorPositionOverFocusedWidget() const
+  {
+    return (this->cursor != NULL) ? this->cursor->getAbsCoor2D() : Vector2D(0,0);
+  }
+
 
   void GLGuiHandler::draw()

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

@@ -30 +30 @@
     GLGuiCursor* getCursor() const { return this->cursor; }
 
+    Vector2D cursorPositionOverFocusedWidget() const;
+
     void activate();
     void deactivate();

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

@@ -17 +17 @@
 
 #include "glgui_slider.h"
+#include "event_def.h"
 
 namespace OrxGui
@@ -35 +36 @@
   */
   GLGuiSlider::~GLGuiSlider()
-  {
-  }
+  {}
 
   /**
@@ -53 +53 @@
     this->_maxValue = 1.0;
     this->_step = 0.1;
+    this->_sliderWidth = 5.0;
+    this->grabbed = false;
 
     this->setSize2D(100, 30);
@@ -61 +63 @@
   void GLGuiSlider::setValue(float value)
   {
-    this->_value = value;
+    if (value < this->min())
+      this->_value = min();
+    else if (value > max())
+      this->_value = max();
+    else
+      this->_value = value;
+    printf("VALUE %f\n", _value);
   }
 
   void GLGuiSlider::setMin(float minimum)
   {
-    this->_minValue = minimum;
+    if (minimum <= max())
+     this->_minValue = minimum;
+
+    if (this->value() < minimum)
+      this->_value = minimum;
   }
 
   void GLGuiSlider::setMax(float maximum)
   {
-    this->_maxValue = maximum;
+    if (maximum >= min())
+      this->_maxValue = maximum;
+
+    if (this->value() > maximum)
+      this->_value = maximum;
   }
 
   void GLGuiSlider::setRange(float minimum, float maximum)
   {
-    this->_minValue = minimum;
-    this->_maxValue = maximum;
+    if (minimum < maximum)
+    {
+      this->_minValue = minimum;
+      this->_maxValue = maximum;
+    }
+    if (this->value() < minimum)
+      this->_value = minimum;
+    else if (this->value() > maximum)
+      this->_value = maximum;
   }
 
@@ -93 +116 @@
   }
 
+
+  void GLGuiSlider::clicked(const Vector2D& pos)
+  {
+    GLGuiWidget::clicked(pos);
+
+    float sliderPosition = this->sliderPosition();
+    if (sliderPosition > pos.x + this->_sliderWidth)
+      this->setValue(this->value() - this->step());
+
+    else if (sliderPosition < pos.x - this->_sliderWidth)
+      this->setValue(this->value() + this->step());
+    else
+      this->grabbed = true;
+
+
+
+    printf("clicked at position: "), pos.debug();
+  }
+
+  void GLGuiSlider::released(const Vector2D& pos)
+  {
+    GLGuiWidget::released(pos);
+    this->grabbed = false;
+  }
+
+  void GLGuiSlider::removedFocus()
+  {
+    GLGuiWidget::removedFocus();
+    this->grabbed = false;
+  }
+
+  float GLGuiSlider::sliderPosition() const
+  {
+    return (this->_value - this->_minValue)/( this->_maxValue - this->_minValue) * (this->getSizeX2D() - 4.0) + 2.0;
+  }
+
+  float GLGuiSlider::sliderValue(float position) const
+  {
+    return (position - 2.0) / (this->getSizeX2D() - 4.0)  *( this->_maxValue - this->_minValue) +this->_minValue ;
+  }
+
+  /*  virtual void GLGuiSlider::tick(float dt)
+    {
+      if (this->grabbed)
+      {
+        this->setValue( 1);
+      }
+    }*/
+
   /**
    * @brief draws the GLGuiSlider
@@ -104 +176 @@
     this->drawRect(this->frontRect());
 
-    float percentagePosition = (this->_value - this->_minValue)/( this->_maxValue - this->_minValue);
-
-    this->drawRect(Rect2D(percentagePosition* this->getSizeX2D(), 2, 5, this->getSizeY2D() - 4));
+    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, 2, _sliderWidth, this->getSizeY2D() - 4));
 
     this->endDraw();
   }
+
+  bool GLGuiSlider::processEvent( const Event& event )
+  {
+    if (this->grabbed && event.type == EV_MOUSE_MOTION)
+    {
+      this->setValue(sliderValue(event.x - this->getAbsCoor2D().x));
+      return true;
+    }
+    return false;
+  }
 }

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

@@ -43 +43 @@
     void setStep(float step);
 
+
+//    virtual void tick(float dt);
+    virtual bool processEvent(const Event& event);
     virtual void draw() const;
 
   protected:
-    void resize();
+    virtual void resize();
+
+    virtual void clicked(const Vector2D& pos);
+    virtual void released(const Vector2D& pos);
+    virtual void removedFocus();
 
   private:
     void init();
+    float sliderPosition() const;
+    float sliderValue(float position) const;
   private:
 
@@ -60 +69 @@
     float            _value;
 
+    float            _sliderWidth;
+
+    bool             grabbed;
+
   };
 }