From 88da7f5157777f8b5e4159cbb3a845cb41e6b272 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 1 Oct 2014 19:53:50 +0200
Subject: [PATCH] Adjust border skin for loading bar and message boxes to match
 vanilla MW

---
 apps/openmw/mwgui/messagebox.cpp         | 8 +++-----
 files/mygui/openmw_loading_screen.layout | 2 +-
 files/mygui/openmw_messagebox.layout     | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 80f38ba40..d4520aad7 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -157,12 +157,11 @@ namespace MWGui
       , mMaxTime(0)
     {
         // defines
-        mBottomPadding = 20;
-        mNextBoxPadding = 20;
+        mBottomPadding = 48;
+        mNextBoxPadding = 4;
 
         getWidget(mMessageWidget, "message");
 
-        mMessageWidget->setOverflowToTheLeft(true);
         mMessageWidget->setCaptionWithReplacing(mMessage);
     }
 
@@ -178,7 +177,7 @@ namespace MWGui
 
     int MessageBox::getHeight ()
     {
-        return mMainWidget->getHeight()+mNextBoxPadding; // 20 is the padding between this and the next MessageBox
+        return mMainWidget->getHeight()+mNextBoxPadding;
     }
 
 
@@ -204,7 +203,6 @@ namespace MWGui
         getWidget(mMessageWidget, "message");
         getWidget(mButtonsWidget, "buttons");
 
-        mMessageWidget->setOverflowToTheLeft(true);
         mMessageWidget->setSize(400, mMessageWidget->getHeight());
         mMessageWidget->setCaptionWithReplacing(message);
 
diff --git a/files/mygui/openmw_loading_screen.layout b/files/mygui/openmw_loading_screen.layout
index eda002040..49ee0a1de 100644
--- a/files/mygui/openmw_loading_screen.layout
+++ b/files/mygui/openmw_loading_screen.layout
@@ -4,7 +4,7 @@
     <!-- The entire screen -->
     <Widget type="Widget" layer="LoadingScreen" position="0 0 300 300" name="_Main" align="Stretch">
 
-        <Widget type="Widget" skin="HUD_Box" position="0 245 300 48" align="Bottom HCenter">
+        <Widget type="Widget" skin="MW_Dialog" position="0 245 300 48" align="Bottom HCenter">
 
             <Widget type="TextBox" skin="SandText" position="20 8 260 18" name="LoadingText">
                 <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_messagebox.layout b/files/mygui/openmw_messagebox.layout
index 8264d64b9..a70e14503 100644
--- a/files/mygui/openmw_messagebox.layout
+++ b/files/mygui/openmw_messagebox.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_Dialog" layer="Notification" position="0 0 0 0" name="_Main">
+    <Widget type="VBox" skin="HUD_Box" layer="Notification" position="0 0 0 0" name="_Main">
         <Property key="Padding" value="10"/>
         <Property key="AutoResize" value="true"/>