diff --git a/CleanAMP/main.png b/CleanAMP/main.png index e1cfc1e..f625415 100644 Binary files a/CleanAMP/main.png and b/CleanAMP/main.png differ diff --git a/MainDisplay.cpp b/MainDisplay.cpp index 26ff130..94c7797 100644 --- a/MainDisplay.cpp +++ b/MainDisplay.cpp @@ -19,8 +19,8 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent) SetupPushButtons (); SetupToggleButtons (); - m_text = new TextScroller (this, 154, 15, "main"); - m_text->move (109, 23); + m_text = new TextScroller (this, 154, 10, "main"); + m_text->move (112, 25); m_time = new TimeDisplay(this, 0); connect (m_time, SIGNAL(clicked()), this, SLOT(toggleTime())); diff --git a/TextBar.cpp b/TextBar.cpp index 54ed029..02cec98 100644 --- a/TextBar.cpp +++ b/TextBar.cpp @@ -40,12 +40,6 @@ TextScroller::TextScroller (QWidget *parent, uint w, setMinimumSize(m_w + 2, m_h); setMaximumSize(m_w + 2, m_h); - if (m_h > 10) { - m_y = 4; - } else { - m_y = 0; - } - m_timer = new QTimer (this); connect (m_timer, SIGNAL (timeout()), this, SLOT (addOffset ())); connect (xmmsh, SIGNAL (settingsSaved ()), this, SLOT (settingsSaved ())); @@ -149,7 +143,7 @@ TextScroller::drawBitmapFont (QString text) p = skin->getLetter(' '); } - paint.drawPixmap (QRect ((i * 6), m_y, 4, 6), + paint.drawPixmap (QRect ((i * 6), 0, 4, 6), p, p.rect()); } diff --git a/TextBar.h b/TextBar.h index d47f6e1..e808e4b 100644 --- a/TextBar.h +++ b/TextBar.h @@ -38,7 +38,6 @@ class TextScroller : public QWidget private: int m_w; int m_h; - int m_y; int m_x_off; int m_x2_off; int m_fontsize;