diff options
author | Yotam Barnoy | 2010-10-31 11:08:43 +0000 |
---|---|---|
committer | Yotam Barnoy | 2010-10-31 11:08:43 +0000 |
commit | 94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1 (patch) | |
tree | 3df2a4ae7967c56d464729669fc06ce4e93dff36 /gui/message.cpp | |
parent | 8df4278ba8cfbf71228e1927f9db635a9a30a57f (diff) | |
parent | dca3c8d8bfc6c4db38cf8e8291818dd472041d4e (diff) | |
download | scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.tar.gz scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.tar.bz2 scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.zip |
Updated with latest from trunk
svn-id: r53976
Diffstat (limited to 'gui/message.cpp')
-rw-r--r-- | gui/message.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gui/message.cpp b/gui/message.cpp index 6406976569..06b4524eab 100644 --- a/gui/message.cpp +++ b/gui/message.cpp @@ -58,7 +58,11 @@ MessageDialog::MessageDialog(const Common::String &message, const char *defaultB int maxlineWidth = g_gui.getFont().wordWrapText(message, screenW - 2 * 20, lines); // Calculate the desired dialog size (maxing out at 300*180 for now) - _w = maxlineWidth + 20; + if (altButton) + _w = MAX(maxlineWidth, (2 * buttonWidth) + 10) + 20; + else + _w = MAX(maxlineWidth, buttonWidth) + 20; + lineCount = lines.size(); _h = 16; |