skinned ui: fixed playlist titlebar resize bug

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2950 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 17 insertions, 16 deletions

diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index e19b0e967..0ccda542b 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -106,6 +106,7 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent)
     m_listWidget->setModel(m_pl_manager->selectedPlayList());
 
     m_titleBar = new PlayListTitleBar (this);
+    m_titleBar->setMinimumSize(0,0);
     m_titleBar->move (0,0);
     connect (m_pl_manager, SIGNAL (currentPlayListChanged(PlayListModel *, PlayListModel *)),
              m_titleBar, SLOT(setModel(PlayListModel*)));
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp
index d86d93b96..85e993215 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.cpp
+++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp
@@ -74,8 +74,8 @@ PlayListTitleBar::~PlayListTitleBar()
 
 void PlayListTitleBar::updatePositions()
 {
-    int sx = (width()-275*m_ratio)/25;
     m_ratio = m_skin->ratio();
+    int sx = (width()-275*m_ratio)/25;
     m_close->move(m_ratio*264+sx*25,m_ratio*3);
     m_shade->move(m_ratio*255+sx*25,m_ratio*3);
     if (m_shade2)
@@ -147,8 +147,8 @@ void PlayListTitleBar::resizeEvent(QResizeEvent *)
 {
     QFontMetrics metrics(m_font);
     m_truncatedText = metrics.elidedText (m_text, Qt::ElideRight, width() -  35*m_ratio);
-    updatePixmap();
     updatePositions();
+    updatePixmap();
 }
 
 void PlayListTitleBar::mousePressEvent(QMouseEvent* event)
@@ -251,7 +251,7 @@ void PlayListTitleBar::shade()
 
 void PlayListTitleBar::mouseDoubleClickEvent (QMouseEvent *)
 {
-       PlayListTitleBar::shade();
+    PlayListTitleBar::shade();
 }
 
 void PlayListTitleBar::showCurrent()
diff --git a/src/plugins/Ui/skinned/skin.h b/src/plugins/Ui/skinned/skin.h
index c6dec4576..6c0169b7b 100644
--- a/src/plugins/Ui/skinned/skin.h
+++ b/src/plugins/Ui/skinned/skin.h
@@ -226,7 +226,7 @@ public:
         TITLEBAR_A = 0,
         TITLEBAR_I,
         TITLEBAR_SHADED_A,
-        TITLEBAR_SHADED_I,
+        TITLEBAR_SHADED_I
     };
     enum PlayList
     {
@@ -250,7 +250,7 @@ public:
         PL_TITLEBAR_SHADED1_A,
         PL_TITLEBAR_SHADED1_I,
         PL_TITLEBAR_SHADED2,
-        PL_TFILL_SHADED,
+        PL_TFILL_SHADED
     };
     enum Equalizer
     {
@@ -265,27 +265,27 @@ public:
         EQ_VOLUME3,
         EQ_BALANCE1,
         EQ_BALANCE2,
-        EQ_BALANCE3,
+        EQ_BALANCE3
     };
     enum MonoSter
     {
         MONO_A = 0,
         MONO_I,
         STEREO_A,
-        STEREO_I,
+        STEREO_I
     };
     enum OtherParts
     {
         PLAY = 0,
         PAUSE,
-        STOP,
+        STOP
     };
     enum Regions
     {
         NORMAL = 0,
         EQUALIZER,
         WINDOW_SHADE,
-        EQUALIZER_WS,
+        EQUALIZER_WS
     };
     enum Cursors
     {
@@ -298,29 +298,29 @@ public:
         CUR_TITLEBAR,
         CUR_VOLBAL,
         CUR_WINBUT,
-        
+
         CUR_WSNORMAL,
         CUR_WSPOSBAR,
-        
+
         CUR_EQCLOSE,
         CUR_EQNORMAL,
         CUR_EQSLID,
         CUR_EQTITLE,
-        
+
         CUR_PCLOSE,
         CUR_PNORMAL,
         CUR_PSIZE,
         CUR_PTBAR,
         CUR_PVSCROLL,
         CUR_PWINBUT,
-        
+
         CUR_PWSNORM,
         CUR_PWSSIZE,
-        
+
         CUR_VOLBAR,
         CUR_WSCLOSE,
         CUR_WSMIN,
-        CUR_WSWINBUT,
+        CUR_WSWINBUT
     };
 
 public slots:
@@ -338,7 +338,7 @@ private:
 
     /*!
      * As far as there is no standard in skin making we cannot be sure
-     * that all needful images we can find in skin :( This will cause 
+     * that all needful images we can find in skin :( This will cause
      * segfaults and asserts. So to prevent this we need such method
      * to load pixmap from default skin.
      */