libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-20 19:21:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Fix computation of MessageDialog width

Browse Source 
This was a regression introduced in fea19c69a. The code forgot to
add the margin on either side of the text when computing the width
of the dialog.

I also introduced a variable with the mergin value to clarify the
code (and also make it easy to change that margin in the future if
we want to).
This commit is contained in:
Thierry Crozat 2021-08-18 22:36:59 +01:00
parent 9f46c9a3ac
commit e012014c29
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gui/message.cpp
View File

@ -58,13 +58,14 @@ void MessageDialog::init(const Common::U32String &message,
// the real size of the dialog
Common::Array<Common::U32String> lines;
int lineCount;
int maxlineWidth = g_gui.getFont().wordWrapText(message, screenW - 2 * 20, lines);
const int horizontalMargin = 10;
int maxlineWidth = g_gui.getFont().wordWrapText(message, screenW - 2 * horizontalMargin - 20, lines);
const int buttonCount = altButtons.size() + 1;
const int buttonSpacing = 10;
const int buttonsTotalWidth = buttonCount * buttonWidth + (buttonCount - 1) * buttonSpacing;
// Calculate the desired dialog size (maxing out at 300*180 for now)
_w = MAX(maxlineWidth, buttonsTotalWidth + 20);
_w = MAX(maxlineWidth, buttonsTotalWidth) + 2 * horizontalMargin;
lineCount = lines.size();
@ -84,7 +85,7 @@ void MessageDialog::init(const Common::U32String &message,
// Each line is represented by one static text item.
for (int i = 0; i < lineCount; i++) {
new StaticTextWidget(this, 10, 10 + i * kLineHeight, maxlineWidth, kLineHeight, lines[i], alignment);
new StaticTextWidget(this, horizontalMargin, 10 + i * kLineHeight, maxlineWidth, kLineHeight, lines[i], alignment);
}
// Assume defaultButton is always given