From b575931c13a278c7c483d23a0cb3bdafcd46fd89 Mon Sep 17 00:00:00 2001 From: Tobias Rundstrom Date: Wed, 15 Mar 2006 19:07:53 -0400 Subject: [PATCH] Fix correct offsets for the textbar in the maindisplay. --- CleanAMP/main.png | Bin 5319 -> 4948 bytes MainDisplay.cpp | 4 ++-- TextBar.cpp | 8 +------- TextBar.h | 1 - 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/CleanAMP/main.png b/CleanAMP/main.png index e1cfc1e334b45492aad626e6e7111c8a5cb72ae6..f625415ceb990ec29e695ffde4192fb49f21ce0e 100644 GIT binary patch literal 4948 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�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 Z{6FS!Rz3_hsC@tc002ovPDHLkV1f~(eNX@Z 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;