brian/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sliders (equalizer and posbar) now display the correct pixmaps when pressed

Browse source
This commit is contained in:
Thomas Frauendorfer 2008-02-05 20:04:01 +01:00
parent ba27687590
commit 0da2995880
5 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/PosBar.cpp
View file

@ -28,14 +28,13 @@ PosButton::PosButton (QWidget *parent, uint normal, uint pressed) : Button (pare
m_slider = dynamic_cast<PosBar *>(parent); m_slider = dynamic_cast<PosBar *>(parent);
setMinimumSize (29, 10); setMinimumSize (29, 10);
setMaximumSize (29, 10); setMaximumSize (29, 10);
m_moving = false;
} }
void void
PosButton::setPos (uint pos) PosButton::setPos (uint pos)
{ {
m_pos = pos; m_pos = pos;
if (!m_moving) { if (!isDown ()) {
move (pos, 0); move (pos, 0);
} }
} }
@ -54,13 +53,13 @@ PosButton::mousePressEvent (QMouseEvent *event)
m_diffx = p.x(); m_diffx = p.x();
m_diffy = p.y(); m_diffy = p.y();
m_moving = true; setDown (true);
} }
void void
PosButton::mouseReleaseEvent (QMouseEvent *event) PosButton::mouseReleaseEvent (QMouseEvent *event)
{ {
m_moving = false; setDown (false);
float value = pos().x() / (float)(m_slider->width() - width()); float value = pos().x() / (float)(m_slider->width() - width());

1
src/PosBar.h
View file

@ -35,7 +35,6 @@ class PosButton : public Button
private: private:
PosBar *m_slider; PosBar *m_slider;
bool m_moving;
uint m_pos; uint m_pos;
uint m_diffx; uint m_diffx;
uint m_diffy; uint m_diffy;

4
src/Skin.cpp
View file

@ -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_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, 164, 11, 11);
m_items[EQ_WIN_BAR_BTN_0] = img->copy (0, 176, 11, 11); m_items[EQ_WIN_BAR_BTN_1] = img->copy (0, 176, 11, 11);
delete img; delete img;
} else { } else {

5
src/VolumeSlider.cpp
View file

@ -184,7 +184,6 @@ SliderButton::SliderButton (QWidget *parent, uint normal, uint pressed,
m_slider = dynamic_cast<Slider *>(parent); m_slider = dynamic_cast<Slider *>(parent);
m_vertical = vertical; m_vertical = vertical;
m_diff = 0; m_diff = 0;
m_moving = false;
if (m_vertical) { if (m_vertical) {
move(1, 0); move(1, 0);
@ -202,14 +201,14 @@ SliderButton::mousePressEvent (QMouseEvent *event)
} else { } else {
m_diff = x() - event->pos().x(); m_diff = x() - event->pos().x();
} }
m_moving = true; setDown (true);
} }
void void
SliderButton::mouseReleaseEvent (QMouseEvent *event) SliderButton::mouseReleaseEvent (QMouseEvent *event)
{ {
m_moving = false; setDown (false);
} }

1
src/VolumeSlider.h
View file

@ -43,7 +43,6 @@ class SliderButton : public Button
Slider *m_slider; Slider *m_slider;
bool m_vertical; bool m_vertical;
int m_diff; int m_diff;
bool m_moving;
}; };
class Slider : public PixWidget class Slider : public PixWidget