Add slider widget

svn-id: r4496

4 files changed, 56 insertions, 2 deletions

diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index 682a36fb2c..7bfd85c2e6 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -67,12 +67,17 @@ void Dialog::handleKey(char key, int modifiers)
 void Dialog::handleMouseMoved(int x, int y, int button)
 {
 	Widget *w = findWidget(x - _x, y - _y);
+	if (!w)
+		return;
+
 	if (_mouseWidget != w) {
 		if (_mouseWidget)
 			_mouseWidget->handleMouseLeft(button);
 		if (w)
 			w->handleMouseEntered(button);
 		_mouseWidget = w;
+	} else if (w->getFlags() & WIDGET_TRACK_MOUSE) {
+		w->handleMouseMoved(x - _x - w->_x, y - _y - w->_y, button);
 	}
 }
 
@@ -147,6 +152,9 @@ SaveLoadDialog::SaveLoadDialog(NewGui *gui)
 	
 	// FIXME - test
 	new CheckboxWidget(this, 50, 20, 100, 16, "Toggle me", 0);
+
+	// FIXME - test
+	new SliderWidget(this, 50, 50, 100, 16, "Volume", 0);
 }
 
 void SaveLoadDialog::handleCommand(uint32 cmd)
diff --git a/gui/widget.cpp b/gui/widget.cpp
index cb3fce0ed5..dc65a1422a 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -153,3 +153,33 @@ void CheckboxWidget::drawWidget(bool hilite)
 	// Finally draw the label
 	gui->drawString(_text, _x + 20, _y + 3, _w, gui->_textcolor);
 }
+
+#pragma mark -
+SliderWidget::SliderWidget(Dialog *boss, int x, int y, int w, int h, const char *label, uint32 cmd, uint8 hotkey)
+	: ButtonWidget(boss, x, y, w, h, label, cmd, hotkey)
+{
+	_flags = WIDGET_ENABLED | WIDGET_TRACK_MOUSE;
+	_type = kSliderWidget;
+}
+
+void SliderWidget::drawWidget(bool hilite)
+{
+	NewGui *gui = _boss->getGui();
+	
+	// Draw the box
+	gui->box(_x, _y, _w, _h);
+
+	// Draw the 'bar'
+	gui->line(_x + 2 + ((_w - 5)* _value / 100), _y + 2, _x + 2 + ((_w - 5)* _value / 100), _y + _h - 3, hilite ? gui->_textcolorhi : gui->_textcolor);
+}
+
+void SliderWidget::handleMouseMoved(int x, int y, int state) { 
+	if (state == 1) {
+		int newvalue = x * 100 / _w;
+
+		if (newvalue != _value) {
+			_value = newvalue; 
+			setFlags(WIDGET_CLEARBG); draw(); clearFlags(WIDGET_CLEARBG);
+		}
+	}
+}
\ No newline at end of file
diff --git a/gui/widget.h b/gui/widget.h
index 0e8e15cce7..afcf19011f 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -33,12 +33,14 @@ enum {
 	WIDGET_BORDER		= 1 << 3,
 	WIDGET_CLEARBG		= 1 << 4,
 	WIDGET_WANT_TICKLE	= 1 << 5,
+	WIDGET_TRACK_MOUSE  = 1 << 6
 };
 
 enum {
 	kStaticTextWidget	= 'TEXT',
 	kButtonWidget		= 'BTTN',
 	kCheckboxWidget		= 'CHKB',
+	kSliderWidget		= 'SLDE'
 };
 
 /* Widget */
@@ -58,6 +60,7 @@ public:
 	virtual void handleClick(int button)		{}
 	virtual void handleMouseEntered(int button)	{}
 	virtual void handleMouseLeft(int button)	{}
+	virtual void handleMouseMoved(int x, int y, int button) {}
 	void draw();
 
 	void setFlags(int flags)	{ _flags |= flags; }
@@ -116,5 +119,18 @@ protected:
 	void drawWidget(bool hilite);
 };
 
+/* SliderWidget */
+class SliderWidget : public ButtonWidget {
+protected:
+	int	_value;
+public:
+	SliderWidget(Dialog *boss, int x, int y, int w, int h, const char *label, uint32 cmd = 0, uint8 hotkey = 0);
+	void handleMouseMoved(int x, int y, int button);
+
+protected:
+	void drawWidget(bool hilite);
+};
+
+
 
 #endif
diff --git a/newgui.cpp b/newgui.cpp
index 378e04f6c6..059980b67e 100644
--- a/newgui.cpp
+++ b/newgui.cpp
@@ -84,12 +84,12 @@ void NewGui::loop()
 	}
 	_s->animateCursor();
 	_s->getKeyInput(0);
-	if (_s->_mouseButStat & MBS_LEFT_CLICK) {
+	if (_s->_mouseButStat & MBS_LEFT_CLICK) {		
 		activeDialog->handleClick(_s->mouse.x, _s->mouse.y, _s->_mouseButStat);
 	} else if (_s->_lastKeyHit) {
 		activeDialog->handleKey(_s->_lastKeyHit, 0);
 	} else if (_old_mouse.x != _s->mouse.x || _old_mouse.y != _s->mouse.y) {
-		activeDialog->handleMouseMoved(_s->mouse.x, _s->mouse.y, _s->_mouseButStat);
+		activeDialog->handleMouseMoved(_s->mouse.x, _s->mouse.y, _s->_leftBtnPressed);
 		_old_mouse.x = _s->mouse.x;
 		_old_mouse.y = _s->mouse.y;
 	}