aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/skinned
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-05-29 17:28:32 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-05-29 17:28:32 +0000
commited7486688cac4e1597da82b9f4e55b688698121c (patch)
tree9d7531f594df0fb9dd467da8870f992eab596643 /src/plugins/Ui/skinned
parent73244c4e9543e2a2c87a18bd9e1ef744e7c924df (diff)
downloadqmmp-ed7486688cac4e1597da82b9f4e55b688698121c.tar.gz
qmmp-ed7486688cac4e1597da82b9f4e55b688698121c.tar.bz2
qmmp-ed7486688cac4e1597da82b9f4e55b688698121c.zip
fixed restoring from double size
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3501 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui/skinned')
-rw-r--r--src/plugins/Ui/skinned/playlist.cpp11
-rw-r--r--src/plugins/Ui/skinned/playlist.h4
2 files changed, 11 insertions, 4 deletions
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 9df2e1eba..1edc2f0c2 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -539,7 +539,15 @@ void PlayList::updateSkin()
{
setCursor(m_skin->getCursor(Skin::CUR_PNORMAL)); // TODO shaded
m_resizeWidget->setCursor(m_skin->getCursor (Skin::CUR_PSIZE));
- m_ratio = m_skin->ratio();
+ if(m_ratio != m_skin->ratio())
+ {
+ if(m_skin->ratio() < m_ratio)
+ {
+ setMinimumSize (275*m_skin->ratio(), (m_shaded ? 14 : 116)*m_skin->ratio());
+ resize(width()*m_skin->ratio() / m_ratio, height()*m_skin->ratio() / m_ratio);
+ }
+ m_ratio = m_skin->ratio();
+ }
setMinimalMode(m_shaded);
}
@@ -624,7 +632,6 @@ void PlayList::setMinimalMode(bool b)
setMinimumSize(275*m_ratio, 116*m_ratio);
resize (width(), m_height);
setSizeIncrement (25*m_ratio, 29*m_ratio);
-
}
updatePositions();
update();
diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h
index 7390f6936..2fc1b6191 100644
--- a/src/plugins/Ui/skinned/playlist.h
+++ b/src/plugins/Ui/skinned/playlist.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2012 by Ilya Kotov *
+ * Copyright (C) 2006-2013 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -23,7 +23,7 @@
#include <QWidget>
#include <QPointer>
-class QMenu;;
+class QMenu;
class Skin;
class ListWidget;
class PlayListItem;