ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-05-21 05:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Handle safe area in updates dialog

Browse Source
This commit is contained in:
Le Philousophe
2025-06-01 10:32:19 +02:00
committed by Lars Sundström
parent 5e2828b4ae
commit 0304c15ff6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/updates-dialog.cpp
+7 -5
View File
@@ -37,9 +37,8 @@ enum {
UpdatesDialog::UpdatesDialog() : Dialog(30, 20, 260, 124) {
const int screenW = g_system->getOverlayWidth();
const int screenH = g_system->getOverlayHeight();
int16 screenW, screenH;
const Common::Rect safeArea = g_system->getSafeOverlayArea(&screenW, &screenH);
int buttonWidth = g_gui.xmlEval()->getVar("Globals.Button.Width", 0);
int buttonHeight = g_gui.xmlEval()->getVar("Globals.Button.Height", 0);
@@ -56,8 +55,8 @@ UpdatesDialog::UpdatesDialog() : Dialog(30, 20, 260, 124) {
// Using this, and accounting for the space the button(s) need, we can set
// the real size of the dialog
Common::Array<Common::U32String> lines, lines2;
int maxlineWidth = g_gui.getFont().wordWrapText(message, screenW - 2 * 20, lines);
int maxlineWidth2 = g_gui.getFont().wordWrapText(message2, screenW - 2 * 20, lines2);
int maxlineWidth = g_gui.getFont().wordWrapText(message, safeArea.width() - 2 * 20, lines);
int maxlineWidth2 = g_gui.getFont().wordWrapText(message2, safeArea.width() - 2 * 20, lines2);
_w = MAX(MAX(maxlineWidth, maxlineWidth2), (2 * buttonWidth) + 10) + 20;
@@ -72,6 +71,9 @@ UpdatesDialog::UpdatesDialog() : Dialog(30, 20, 260, 124) {
_x = (screenW - _w) / 2;
_y = (screenH - _h) / 2;
// Make it fit inside the safe area
safeArea.constrain(_x, _y, _w, _h);
// Each line is represented by one static text item.
uint y = 10;
for (uint i = 0; i < lines.size(); i++) {