From 0da2995880c77b2c2e86bb943bf0b7a4b550e67e Mon Sep 17 00:00:00 2001
From: Thomas Frauendorfer <caotic@elphiel.gabelsberger28.de>
Date: Tue, 5 Feb 2008 20:04:01 +0100
Subject: [PATCH] Sliders (equalizer and posbar) now display the correct
 pixmaps when pressed

---
 src/PosBar.cpp       | 7 +++----
 src/PosBar.h         | 1 -
 src/Skin.cpp         | 4 ++--
 src/VolumeSlider.cpp | 5 ++---
 src/VolumeSlider.h   | 1 -
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/PosBar.cpp b/src/PosBar.cpp
index 1fad511..4463813 100644
--- a/src/PosBar.cpp
+++ b/src/PosBar.cpp
@@ -28,14 +28,13 @@ PosButton::PosButton (QWidget *parent, uint normal, uint pressed) : Button (pare
 	m_slider = dynamic_cast<PosBar *>(parent);
 	setMinimumSize (29, 10);
 	setMaximumSize (29, 10);
-	m_moving = false;
 }
 
 void
 PosButton::setPos (uint pos)
 {
 	m_pos = pos;
-	if (!m_moving) {
+	if (!isDown ()) {
 		move (pos, 0);
 	}
 }
@@ -54,13 +53,13 @@ PosButton::mousePressEvent (QMouseEvent *event)
 
 	m_diffx = p.x();
 	m_diffy = p.y();
-	m_moving = true;
+	setDown (true);
 }
 
 void
 PosButton::mouseReleaseEvent (QMouseEvent *event)
 {
-	m_moving = false;
+	setDown (false);
 
 	float value = pos().x() / (float)(m_slider->width() - width());
 
diff --git a/src/PosBar.h b/src/PosBar.h
index 3abf3b2..c40c0a9 100644
--- a/src/PosBar.h
+++ b/src/PosBar.h
@@ -35,7 +35,6 @@ class PosButton : public Button
 
 	private:
 		PosBar *m_slider;
-		bool m_moving;
 		uint m_pos;
 		uint m_diffx;
 		uint m_diffy;
diff --git a/src/Skin.cpp b/src/Skin.cpp
index 1103646..e2da390 100644
--- a/src/Skin.cpp
+++ b/src/Skin.cpp
@@ -54,8 +54,8 @@ Skin::BuildEqualizer (void)
 			m_items[EQ_WIN_BAR_POS_14+i] = img->copy (13+15*i, 229, 14, 63);
 		}
 
-		m_items[EQ_WIN_BAR_BTN_1] = img->copy (0, 164, 11, 11);
-		m_items[EQ_WIN_BAR_BTN_0] = img->copy (0, 176, 11, 11);
+		m_items[EQ_WIN_BAR_BTN_0] = img->copy (0, 164, 11, 11);
+		m_items[EQ_WIN_BAR_BTN_1] = img->copy (0, 176, 11, 11);
 
 		delete img;
 	} else {
diff --git a/src/VolumeSlider.cpp b/src/VolumeSlider.cpp
index 4307cce..fd589eb 100644
--- a/src/VolumeSlider.cpp
+++ b/src/VolumeSlider.cpp
@@ -184,7 +184,6 @@ SliderButton::SliderButton (QWidget *parent, uint normal, uint pressed,
 	m_slider = dynamic_cast<Slider *>(parent);
 	m_vertical = vertical;
 	m_diff = 0;
-	m_moving = false;
 
 	if (m_vertical) {
 		move(1, 0);
@@ -202,14 +201,14 @@ SliderButton::mousePressEvent (QMouseEvent *event)
 	} else {
 		m_diff = x() - event->pos().x();
 	}
-	m_moving = true;
+	setDown (true);
 }
 
 
 void
 SliderButton::mouseReleaseEvent (QMouseEvent *event)
 {
-	m_moving = false;
+	setDown (false);
 }
 
 
diff --git a/src/VolumeSlider.h b/src/VolumeSlider.h
index 6f855f1..4360dd5 100644
--- a/src/VolumeSlider.h
+++ b/src/VolumeSlider.h
@@ -43,7 +43,6 @@ class SliderButton : public Button
 		Slider *m_slider;
 		bool m_vertical;
 		int m_diff;
-		bool m_moving;
 };
 
 class Slider : public PixWidget