aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/skinned/playlistslider.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2015-07-26 08:30:52 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2015-07-26 08:30:52 +0000
commit968c05fe1856fb8ee586bb1ebbb0e66fd2661b5a (patch)
treee4e4e1dfe4f6a07cef6198b608d80bf92f68cb17 /src/plugins/Ui/skinned/playlistslider.cpp
parent4c87a6d0b7f3674b3661cfe20a8a51f231ef559c (diff)
downloadqmmp-968c05fe1856fb8ee586bb1ebbb0e66fd2661b5a.tar.gz
qmmp-968c05fe1856fb8ee586bb1ebbb0e66fd2661b5a.tar.bz2
qmmp-968c05fe1856fb8ee586bb1ebbb0e66fd2661b5a.zip
restore playlist changes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5255 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui/skinned/playlistslider.cpp')
-rw-r--r--src/plugins/Ui/skinned/playlistslider.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/Ui/skinned/playlistslider.cpp b/src/plugins/Ui/skinned/playlistslider.cpp
index 57fd21f17..72644e8d4 100644
--- a/src/plugins/Ui/skinned/playlistslider.cpp
+++ b/src/plugins/Ui/skinned/playlistslider.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2009 by Ilya Kotov *
+ * Copyright (C) 2006-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -34,7 +34,6 @@ PlayListSlider::PlayListSlider(QWidget *parent)
m_min = 0;
m_max = 0;
m_value = 0;
- pos = 0;
connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
setCursor(m_skin->getCursor(Skin::CUR_PVSCROLL));
}
@@ -66,15 +65,15 @@ void PlayListSlider::mousePressEvent(QMouseEvent *e)
{
m_moving = true;
m_pressed = true;
- press_pos = e->y();
+ m_press_pos = e->y();
if (m_pos<e->y() && e->y()<m_pos+18*m_skin->ratio())
{
- press_pos = e->y()-m_pos;
+ m_press_pos = e->y()-m_pos;
}
else
{
m_value = convert(qMax(qMin(height()-18*m_skin->ratio(),e->y()-9*m_skin->ratio()),0));
- press_pos = 9*m_skin->ratio();
+ m_press_pos = 9*m_skin->ratio();
if (m_value!=m_old)
{
emit sliderMoved(m_value);
@@ -97,13 +96,13 @@ void PlayListSlider::mouseMoveEvent(QMouseEvent* e)
if (m_moving)
{
int po = e->y();
- po = po - press_pos;
+ po = po - m_press_pos;
- if (0<=po && po<=height()-18*m_skin->ratio())
+ if (0 <= po && po <= height() - 18*m_skin->ratio())
{
m_value = convert(po);
update();
- if (m_value!=m_old)
+ if (m_value != m_old)
{
m_old = m_value;