Ticket #8387: slider.patch

gui/widget.cpp

@@ -18 +18 @@
  * $Header: /cvsroot/scummvm/scummvm/gui/widget.cpp,v 1.38 2004/03/13 13:03:25 fingolfin Exp $
  */
 
+#include <math.h>
+
 #include "stdafx.h"
 #include "common/util.h"
 #include "gui/widget.h"
@@ -208 +210 @@
 }
 
 void SliderWidget::handleMouseMoved(int x, int y, int button) {
-        // TODO: when the mouse is dragged outside the widget, the slider should
-        // snap back to the old value.
         if (isEnabled() && _isDragging && x >= (int)_labelWidth) {
                 int newValue = posToValue(x - _labelWidth);
                 if (newValue < _valueMin)
@@ -228 +228 @@
 void SliderWidget::handleMouseDown(int x, int y, int button, int clickCount) {
         if (isEnabled()) {
                 _isDragging = true;
+                 _valueDragStart = _value;
                 handleMouseMoved(x, y, button);
         }
 }
 
 void SliderWidget::handleMouseUp(int x, int y, int button, int clickCount) {
+        if (isEnabled() && _isDragging)
+                sendCommand(_cmd, _value);
+ 
+        _isDragging = false;
+}
+
+void SliderWidget::handleMouseLeft(int button) {
+        ButtonWidget::handleMouseLeft(button);
         if (isEnabled() && _isDragging) {
+                _value = _valueDragStart;
+                draw();
                 sendCommand(_cmd, _value);
         }
         _isDragging = false;
@@ -249 +260 @@
         // Draw the box
         gui->box(_x + _labelWidth, _y, _w - _labelWidth, _h, gui->_color, gui->_shadowcolor);
 
-        // Draw the 'bar'
-        gui->fillRect(_x + _labelWidth + 2, _y + 2, valueToPos(_value), _h - 4,
-                                !isEnabled() ? gui->_color :
-                                hilite ? gui->_textcolorhi : gui->_textcolor);
+        OverlayColor color = !isEnabled() ? gui->_color : hilite ? gui->_textcolorhi : gui->_textcolor;
+
+        // Draw handle
+        int handlePos = valueToPos(_value);
+        gui->vLine(_x + handlePos + _labelWidth + 2, _y + 4, _y + _h - 6, color);
+        gui->vLine(_x + handlePos + _labelWidth + 1, _y + 3, _y + _h - 5, color);
+        gui->vLine(_x + handlePos + _labelWidth - 1, _y + 3, _y + _h - 5, color);
+        gui->vLine(_x + handlePos + _labelWidth - 2, _y + 4, _y + _h - 6, color);
+
+        // Draw Tracks
+        if (handlePos > 5) {
+                gui->hLine(_x + _labelWidth + 3, _y + _h / 2 - 2, _x + _labelWidth + handlePos - 4, color);
+                gui->hLine(_x + _labelWidth + 3, _y + _h / 2, _x + _labelWidth + handlePos - 4, color);
+        }
+ 
+        if ((uint)handlePos < _w - _labelWidth - 11) {
+                gui->hLine(_x + _labelWidth + handlePos + 4, _y + _h / 2 - 2, _x + _w - 4, color);
+                gui->hLine(_x + _labelWidth + handlePos + 4, _y + _h / 2, _x + _w - 4, color);
+        }
 }
 
 int SliderWidget::valueToPos(int value) {
-        return ((_w - _labelWidth - 4) * (value - _valueMin) / (_valueMax - _valueMin));
+        return ((_w - _labelWidth - 11) * (value - _valueMin) / (_valueMax - _valueMin) + 5);
 }
 
 int SliderWidget::posToValue(int pos) {
-        return (pos) * (_valueMax - _valueMin) / (_w - _labelWidth - 4) + _valueMin;
+        // Align pos to middle of handle
+        if (pos < 5)
+                pos = 5;
+        else if ((uint)pos > _w - _labelWidth - 5)
+                pos = _w - _labelWidth - 5;
+
+        return int(((float)((pos - 5) * (_valueMax - _valueMin)) / (_w - _labelWidth - 11) + _valueMin) + 0.5);
 }
 
 } // End of namespace GUI

gui/widget.h

@@ -185 +185 @@
 /* SliderWidget */
 class SliderWidget : public ButtonWidget {
 protected:
-        int             _value, _oldValue;
+        int             _value, _oldValue, _valueDragStart;
         int             _valueMin, _valueMax;
         bool    _isDragging;
         uint    _labelWidth;
@@ -200 +200 @@
         int getMaxValue() const         { return _valueMax; }
 
         void handleMouseMoved(int x, int y, int button);
+        void handleMouseLeft(int button);
         void handleMouseDown(int x, int y, int button, int clickCount);
         void handleMouseUp(int x, int y, int button, int clickCount);