aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2006-04-11 15:45:21 +0000
committerJohannes Schickel2006-04-11 15:45:21 +0000
commit3ac923ba580c2fa61baf381b38027c3d133dcd3c (patch)
treef3db0a8c0d036fe2c36e16a71757a97bde2214a2
parenta7a5f40cfc4f89ac934d84636fed80222eb6fbc4 (diff)
downloadscummvm-rg350-3ac923ba580c2fa61baf381b38027c3d133dcd3c.tar.gz
scummvm-rg350-3ac923ba580c2fa61baf381b38027c3d133dcd3c.tar.bz2
scummvm-rg350-3ac923ba580c2fa61baf381b38027c3d133dcd3c.zip
Fixes cutted texts with --force-1x-overlay.
svn-id: r21793
-rw-r--r--gui/PopUpWidget.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index 033b5ddaf6..ed6f64e814 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -322,7 +322,7 @@ void PopUpDialog::drawMenuEntry(int entry, bool hilite) {
// Draw a separator
g_gui.theme()->drawLineSeparator(Common::Rect(x, y, x+w, y+kLineHeight));
} else {
- g_gui.theme()->drawText(Common::Rect(x+1, y+2, x+w-1, y+kLineHeight), name, hilite ? Theme::kStateHighlight : Theme::kStateEnabled,
+ g_gui.theme()->drawText(Common::Rect(x+1, y+2, x+w, y+2+kLineHeight), name, hilite ? Theme::kStateHighlight : Theme::kStateEnabled,
Theme::kTextAlignLeft);
}
}
@@ -410,7 +410,7 @@ void PopUpWidget::drawWidget(bool hilite) {
// Draw the label, if any
if (_labelWidth > 0)
- g_gui.theme()->drawText(Common::Rect(_x+2,_y+3,_x+_labelWidth, _y+g_gui.theme()->getFontHeight()), _label,
+ g_gui.theme()->drawText(Common::Rect(_x+2,_y+3,_x+2+_labelWidth, _y+3+g_gui.theme()->getFontHeight()), _label,
isEnabled() ? Theme::kStateEnabled : Theme::kStateDisabled, Theme::kTextAlignRight);
// Draw a set of arrows at the right end to signal this is a dropdown/popup
@@ -432,7 +432,7 @@ void PopUpWidget::drawWidget(bool hilite) {
// Draw the selected entry, if any
if (_selectedItem >= 0) {
TextAlignment align = (g_gui.getStringWidth(_entries[_selectedItem].name) > w-6) ? kTextAlignRight : kTextAlignLeft;
- g_gui.theme()->drawText(Common::Rect(x+2, _y+3, _x+w-6, _y+g_gui.theme()->getFontHeight()), _entries[_selectedItem].name,
+ g_gui.theme()->drawText(Common::Rect(x+2, _y+3, _x+2+w-6, _y+3+g_gui.theme()->getFontHeight()), _entries[_selectedItem].name,
isEnabled() ? Theme::kStateEnabled : Theme::kStateDisabled, g_gui.theme()->convertAligment(align));
}
}