Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

2009-01-27 14:08:48 +01:00
parent 9d8fc28706 4362285c8a
commit ad76902f86
6 changed files with 1 additions and 1 deletions
--- a/src/plugins/coreplugin/images/panel_button.png
+++ b/src/plugins/coreplugin/images/panel_button.png
--- a/src/plugins/coreplugin/images/panel_button_checked.png
+++ b/src/plugins/coreplugin/images/panel_button_checked.png
--- a/src/plugins/coreplugin/images/panel_button_checked_hover.png
+++ b/src/plugins/coreplugin/images/panel_button_checked_hover.png
--- a/src/plugins/coreplugin/images/panel_button_hover.png
+++ b/src/plugins/coreplugin/images/panel_button_hover.png
--- a/src/plugins/coreplugin/images/panel_button_pressed.png
+++ b/src/plugins/coreplugin/images/panel_button_pressed.png
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -520,7 +520,7 @@ void OutputPaneToggleButton::paintEvent(QPaintEvent *event)
    QPushButton::paintEvent(event);
    const QFontMetrics fm = fontMetrics();
-    const int baseLine = (height() - fm.height()) / 2 + fm.ascent();
+    const int baseLine = (height() - fm.height() + 1) / 2 + fm.ascent();
    const int numberWidth = fm.width(m_number);
    QPainter p(this);