Fix correct offsets for the textbar in the maindisplay.
This commit is contained in:
parent
bf50790f49
commit
b575931c13
4 changed files with 3 additions and 10 deletions
Binary file not shown.
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 4.8 KiB |
|
@ -19,8 +19,8 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent)
|
||||||
SetupPushButtons ();
|
SetupPushButtons ();
|
||||||
SetupToggleButtons ();
|
SetupToggleButtons ();
|
||||||
|
|
||||||
m_text = new TextScroller (this, 154, 15, "main");
|
m_text = new TextScroller (this, 154, 10, "main");
|
||||||
m_text->move (109, 23);
|
m_text->move (112, 25);
|
||||||
|
|
||||||
m_time = new TimeDisplay(this, 0);
|
m_time = new TimeDisplay(this, 0);
|
||||||
connect (m_time, SIGNAL(clicked()), this, SLOT(toggleTime()));
|
connect (m_time, SIGNAL(clicked()), this, SLOT(toggleTime()));
|
||||||
|
|
|
@ -40,12 +40,6 @@ TextScroller::TextScroller (QWidget *parent, uint w,
|
||||||
setMinimumSize(m_w + 2, m_h);
|
setMinimumSize(m_w + 2, m_h);
|
||||||
setMaximumSize(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);
|
m_timer = new QTimer (this);
|
||||||
connect (m_timer, SIGNAL (timeout()), this, SLOT (addOffset ()));
|
connect (m_timer, SIGNAL (timeout()), this, SLOT (addOffset ()));
|
||||||
connect (xmmsh, SIGNAL (settingsSaved ()), this, SLOT (settingsSaved ()));
|
connect (xmmsh, SIGNAL (settingsSaved ()), this, SLOT (settingsSaved ()));
|
||||||
|
@ -149,7 +143,7 @@ TextScroller::drawBitmapFont (QString text)
|
||||||
p = skin->getLetter(' ');
|
p = skin->getLetter(' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
paint.drawPixmap (QRect ((i * 6), m_y, 4, 6),
|
paint.drawPixmap (QRect ((i * 6), 0, 4, 6),
|
||||||
p, p.rect());
|
p, p.rect());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,6 @@ class TextScroller : public QWidget
|
||||||
private:
|
private:
|
||||||
int m_w;
|
int m_w;
|
||||||
int m_h;
|
int m_h;
|
||||||
int m_y;
|
|
||||||
int m_x_off;
|
int m_x_off;
|
||||||
int m_x2_off;
|
int m_x2_off;
|
||||||
int m_fontsize;
|
int m_fontsize;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue