From 358cc3c62febd25a28f7e81156e0da3177153d6e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 23 Jan 2014 12:24:06 +0100
Subject: [PATCH] Closes #1060: Fix incorrect message box size
---
apps/openmw/mwgui/messagebox.cpp | 33 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 644b8f66a5..74231c008d 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -287,24 +287,6 @@ namespace MWGui
else {
mainWidgetSize.width = textSize.width + 3*textPadding;
}
- mainWidgetSize.height = textSize.height + 2*textPadding + textButtonPadding + buttonHeight * buttons.size() + buttonMainPadding;
-
- mMainWidget->setSize(mainWidgetSize);
-
- MyGUI::IntCoord absCoord;
- absCoord.left = (gameWindowSize.width - mainWidgetSize.width)/2;
- absCoord.top = (gameWindowSize.height - mainWidgetSize.height)/2;
-
- mMainWidget->setCoord(absCoord);
- mMainWidget->setSize(mainWidgetSize);
-
-
- MyGUI::IntCoord messageWidgetCoord;
- messageWidgetCoord.left = (mainWidgetSize.width - textSize.width)/2;
- messageWidgetCoord.top = textPadding;
- mMessageWidget->setCoord(messageWidgetCoord);
-
- mMessageWidget->setSize(textSize);
MyGUI::IntCoord buttonCord;
MyGUI::IntSize buttonSize(0, buttonHeight);
@@ -326,6 +308,21 @@ namespace MWGui
top += buttonSize.height + 2*buttonTopPadding;
}
+ mainWidgetSize.height = top + buttonMainPadding;
+ mMainWidget->setSize(mainWidgetSize);
+
+ MyGUI::IntPoint absPos;
+ absPos.left = (gameWindowSize.width - mainWidgetSize.width)/2;
+ absPos.top = (gameWindowSize.height - mainWidgetSize.height)/2;
+
+ mMainWidget->setPosition(absPos);
+
+ MyGUI::IntCoord messageWidgetCoord;
+ messageWidgetCoord.left = (mainWidgetSize.width - textSize.width)/2;
+ messageWidgetCoord.top = textPadding;
+ messageWidgetCoord.width = textSize.width;
+ messageWidgetCoord.height = textSize.height;
+ mMessageWidget->setCoord(messageWidgetCoord);
}
// Set key focus to "Ok" button