skinned: fixed text scroller geometry

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

2 files changed, 7 insertions, 6 deletions

diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp
index 3284abf07..ca836ddad 100644
--- a/src/plugins/Ui/skinned/display.cpp
+++ b/src/plugins/Ui/skinned/display.cpp
@@ -161,7 +161,7 @@ void MainDisplay::updatePositions()
     m_shuffleButton->move (r*164, r*89);
     m_kbps->move (r*111, r*43);
     m_freq->move (r*156, r*43);
-    m_text->resize (r*154, r*15);
+    m_text->resize (r*154, r*16);
     m_text->move (r*109, r*23);
     m_monoster->move (r*212, r*41);
     m_playstatus->move(r*24, r*28);
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index 5c8558f0b..b178d5dbf 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -62,7 +62,6 @@ TextScroller::TextScroller (QWidget *parent) : QWidget (parent)
     m_transparencyAction = m_menu->addAction(tr("Transparent Background"), this, SLOT(updateText()));
     m_scrollAction->setCheckable(true);
     m_transparencyAction->setCheckable(true);
-    connect(m_scrollAction, SIGNAL(toggled(bool)), SLOT(updateText()));
     connect(m_timer, SIGNAL (timeout()), SLOT (addOffset()));
     connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin()));
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(processState(Qmmp::State)));
@@ -117,7 +116,9 @@ void TextScroller::updateSkin()
     QString fontname = settings.value("Skinned/mw_font", QApplication::font().toString()).toString();
     m_font.fromString(fontname);
     if (m_metrics)
+    {
         delete m_metrics;
+    }
     else
     {
         m_scrollAction->setChecked(settings.value("Skinned/autoscroll", true).toBool());
@@ -286,9 +287,9 @@ void TextScroller::preparePixmap(const QString &text, bool scrollable)
          painter.setPen(m_color);
          painter.setFont(m_font);
          if(bitmap)
-             drawBitmapText (0,12, fullText, &painter, m_skin);
+             drawBitmapText (0, 10 * m_ratio, fullText, &painter, m_skin);
          else
-             painter.drawText (0,12, fullText);
+             painter.drawText (0, qMin(m_pixmap.height() / 2  + m_metrics->ascent() / 2, m_pixmap.height() - 2), fullText);
          m_x1 = 0;
          m_x2 = m_pixmap.width();
     }
@@ -303,9 +304,9 @@ void TextScroller::preparePixmap(const QString &text, bool scrollable)
         painter.setPen(m_color);
         painter.setFont(m_font);
         if(bitmap)
-            drawBitmapText (0,12, text, &painter, m_skin);
+            drawBitmapText (0, 10 * m_ratio, text, &painter, m_skin);
         else
-            painter.drawText (0,12, text);
+            painter.drawText (0, qMin(m_pixmap.height() / 2  + m_metrics->ascent() / 2, m_pixmap.height() - 2), text);
     }
 }