From 7d09a5d644131e794db0d4d8e20c90ea55e4afc6 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 27 Mar 2017 13:33:28 +0400
Subject: [PATCH 1/3] Progress bars vertical alignment

---
 apps/openmw/mwgui/dialogue.hpp                |  2 +-
 files/mygui/openmw_dialogue_window.layout     |  6 ++++--
 files/mygui/openmw_dialogue_window.skin.xml   | 10 ----------
 files/mygui/openmw_progress.skin.xml          |  2 +-
 files/mygui/openmw_stats_window.layout        | 19 +++++++++----------
 files/mygui/openmw_text.skin.xml              |  4 ++--
 files/mygui/openmw_tooltips.layout            |  4 ++--
 .../openmw_wait_dialog_progressbar.layout     |  5 ++---
 8 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index 769c32af7..d34574e89 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -167,7 +167,7 @@ namespace MWGui
         Gui::MWList*   mTopicsList;
         MyGUI::ScrollBar* mScrollBar;
         MyGUI::ProgressBar* mDispositionBar;
-        MyGUI::EditBox*     mDispositionText;
+        MyGUI::TextBox*     mDispositionText;
 
         PersuasionDialog mPersuasionDialog;
     };
diff --git a/files/mygui/openmw_dialogue_window.layout b/files/mygui/openmw_dialogue_window.layout
index a0a4bf441..a85bd5b02 100644
--- a/files/mygui/openmw_dialogue_window.layout
+++ b/files/mygui/openmw_dialogue_window.layout
@@ -16,9 +16,11 @@
         </Widget>
 
         <!-- The disposition bar-->
-        <Widget type="ProgressBar" skin="MW_EnergyBar_Blue" position="398 8 166 18"
+        <Widget type="ProgressBar" skin="MW_Progress_Blue" position="398 8 166 18"
             align="Right Top" name="Disposition">
-            <Widget type="EditBox" skin="MW_DispositionEdit" position_real="0 0 1 1" align="Stretch" name="DispositionText"/>
+            <Widget type="TextBox" skin="ProgressText" position="0 0 166 14" name="DispositionText" align="Right VCenter">
+                <Property key="NeedMouse" value="false"/>
+             </Widget>
         </Widget>
         <!-- The list of topics -->
         <Widget type="MWList" skin="MW_SimpleList" position="398 31 166 328" name="TopicsList" align="Right VStretch">
diff --git a/files/mygui/openmw_dialogue_window.skin.xml b/files/mygui/openmw_dialogue_window.skin.xml
index 3f7987f7a..33c1e7d62 100644
--- a/files/mygui/openmw_dialogue_window.skin.xml
+++ b/files/mygui/openmw_dialogue_window.skin.xml
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Resource" version="1.1">
-
-    <Resource type="ResourceSkin" name="MW_DispositionEdit" size="0 0 50 50">
-        <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Center"/>
-        <Property key="Static" value="1"/>
-        <Property key="WordWrap" value="true"/>
-        <Property key="TextShadow" value="true"/>
-        <Child type="TextBox" skin="SandText" offset="0 0 0 -4" align="Stretch" name="Client"/>
-    </Resource>
-
 </MyGUI>
diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
index 428c7f7df..324307d67 100644
--- a/files/mygui/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -59,7 +59,7 @@
     </Resource>
     <Resource type="ResourceSkin" name="ProgressText" size="16 16">
         <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Top HCenter"/>
+        <Property key="TextAlign" value="VCenter HCenter"/>
         <Property key="TextColour" value="#{fontcolour=normal}"/>
         <Property key="TextShadow" value="true"/>
 
diff --git a/files/mygui/openmw_stats_window.layout b/files/mygui/openmw_stats_window.layout
index 1d9b75b9b..d9860ae20 100644
--- a/files/mygui/openmw_stats_window.layout
+++ b/files/mygui/openmw_stats_window.layout
@@ -20,9 +20,9 @@
                     </Widget>
                     <Widget type="ProgressBar" skin="MW_Progress_Red" position="74 0 130 18" name="HBar" align="Right Top">
                         <Property key="NeedMouse" value="false"/>
-                    </Widget>
-                    <Widget type="TextBox" skin="ProgressText" position="74 0 130 18" name="HBarT" align="Right Top">
-                        <Property key="NeedMouse" value="false"/>
+                        <Widget type="TextBox" skin="ProgressText" position="0 0 130 14" name="HBarT" align="Right VCenter">
+                            <Property key="NeedMouse" value="false"/>
+                        </Widget>
                     </Widget>
                 </Widget>
 
@@ -40,10 +40,9 @@
 
                     <Widget type="ProgressBar" skin="MW_Progress_Blue" position="74 0 130 18" name="MBar" align="Right Top">
                         <Property key="NeedMouse" value="false"/>
-                    </Widget>
-
-                    <Widget type="TextBox" skin="ProgressText" position="74 0 130 18" name="MBarT" align="Right Top">
-                        <Property key="NeedMouse" value="false"/>
+                        <Widget type="TextBox" skin="ProgressText" position="0 0 130 14" name="MBarT" align="Right VCenter">
+                            <Property key="NeedMouse" value="false"/>
+                        </Widget>
                     </Widget>
                 </Widget>
 
@@ -61,9 +60,9 @@
 
                     <Widget type="ProgressBar" skin="MW_Progress_Green" position="74 0 130 18" name="FBar" align="Right Top">
                         <Property key="NeedMouse" value="false"/>
-                    </Widget>
-                    <Widget type="TextBox" skin="ProgressText" position="74 0 130 18" name="FBarT" align="Right Top">
-                        <Property key="NeedMouse" value="false"/>
+                        <Widget type="TextBox" skin="ProgressText" position="0 0 130 14" name="FBarT" align="Right VCenter">
+                            <Property key="NeedMouse" value="false"/>
+                        </Widget>
                     </Widget>
                 </Widget>
             </Widget>
diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml
index b7a893580..89f3690ec 100644
--- a/files/mygui/openmw_text.skin.xml
+++ b/files/mygui/openmw_text.skin.xml
@@ -134,12 +134,12 @@ color_misc=0,205,205 # ????
 
     <Resource type="ResourceSkin" name="MW_ChargeBar" size="204 18">
         <Child type="ProgressBar" skin="MW_Progress_Red" offset="0 0 204 18" align="Right Top Stretch" name="Bar"/>
-        <Child type="TextBox" skin="ProgressText" offset="0 0 204 18" align="Right Top Stretch" name="BarText"/>
+        <Child type="TextBox" skin="ProgressText" offset="0 0 204 14" align="Stretch" name="BarText"/>
     </Resource>
 
     <Resource type="ResourceSkin" name="MW_ChargeBar_Blue" size="204 18">
         <Child type="ProgressBar" skin="MW_Progress_Blue" offset="0 0 204 18" align="Right Top Stretch" name="Bar"/>
-        <Child type="TextBox" skin="ProgressText" offset="0 2 204 18" align="Right Top Stretch" name="BarText"/>
+        <Child type="TextBox" skin="ProgressText" offset="0 0 204 14" align="Right Top Stretch" name="BarText"/>
     </Resource>
 
     <Resource type="ResourceSkin" name="MW_DynamicStat_Red" size="204 18">
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index d47c27976..6d4421702 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -165,7 +165,7 @@
                 </Widget>
 
                 <Widget type="ProgressBar" skin="MW_Progress_Red" position="50 70 200 20" align="HCenter Bottom" name="SkillProgress">
-                    <Widget type="TextBox" skin="ProgressText" position="0 0 200 20" align="Stretch" name="SkillProgressText">
+                    <Widget type="TextBox" skin="ProgressText" position="0 0 200 16" align="Stretch" name="SkillProgressText">
                         <Property key="TextAlign" value="Center"/>
                     </Widget>
                 </Widget>
@@ -211,7 +211,7 @@
             </Widget>
 
             <Widget type="ProgressBar" skin="MW_Progress_Red" position="50 30 200 20" align="HCenter Bottom" name="LevelProgress">
-                <Widget type="TextBox" skin="ProgressText" position="0 0 200 20" align="Stretch" name="LevelProgressText">
+                <Widget type="TextBox" skin="ProgressText" position="0 0 200 16" align="Stretch" name="LevelProgressText">
                     <Property key="TextAlign" value="Center"/>
                 </Widget>
             </Widget>
diff --git a/files/mygui/openmw_wait_dialog_progressbar.layout b/files/mygui/openmw_wait_dialog_progressbar.layout
index 92fcb15cf..8147abbdf 100644
--- a/files/mygui/openmw_wait_dialog_progressbar.layout
+++ b/files/mygui/openmw_wait_dialog_progressbar.layout
@@ -4,10 +4,9 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 219 40" align="Center" name="_Main">
 
         <Widget type="ProgressBar" skin="MW_Progress_Blue" position="5 6 199 20" name="ProgressBar">
-            <Widget type="TextBox" skin="SandText" position="0 0 199 20" name="ProgressText">
-                <Property key="TextAlign" value="Center"/>
+            <Widget type="TextBox" skin="ProgressText" position="0 0 199 16" name="ProgressText" align="Right VCenter">
+                <Property key="NeedMouse" value="false"/>
             </Widget>
         </Widget>
-
     </Widget>
 </MyGUI>

From c9cf0ec9771f0200213ec768d25690564a3c73aa Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 27 Mar 2017 14:38:40 +0400
Subject: [PATCH 2/3] Buttons and widgets captions vertical alignment

---
 files/mygui/openmw_button.skin.xml        | 2 +-
 files/mygui/openmw_edit.skin.xml          | 2 +-
 files/mygui/openmw_loading_screen.layout  | 2 +-
 files/mygui/openmw_resources.xml          | 2 +-
 files/mygui/openmw_savegame_dialog.layout | 1 +
 files/mygui/openmw_text.skin.xml          | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/files/mygui/openmw_button.skin.xml b/files/mygui/openmw_button.skin.xml
index 18055a7e5..09a4c0e39 100644
--- a/files/mygui/openmw_button.skin.xml
+++ b/files/mygui/openmw_button.skin.xml
@@ -81,7 +81,7 @@
         <Child type="Widget" skin="BTN_BottomLeft" offset="0 20 4 4" align="Bottom Left"/>
         <Child type="Widget" skin="BTN_BottomRight" offset="132 20 4 4" align="Bottom Right"/>
 
-        <BasisSkin type="SimpleText" offset="4 4 128 16" align="Stretch">
+        <BasisSkin type="SimpleText" offset="4 3 128 16" align="Stretch">
             <State name="disabled" colour="#{fontcolour=disabled}" shift="0"/>
             <State name="normal" colour="#{fontcolour=normal}" shift="0"/>
             <State name="highlighted" colour="#{fontcolour=normal_over}" shift="0"/>
diff --git a/files/mygui/openmw_edit.skin.xml b/files/mygui/openmw_edit.skin.xml
index 5ec48f752..a53becdaa 100644
--- a/files/mygui/openmw_edit.skin.xml
+++ b/files/mygui/openmw_edit.skin.xml
@@ -23,7 +23,7 @@
         <Property key="TextAlign" value="Left VCenter"/>
         <Property key="TextColour" value="#{fontcolour=normal}"/>
 
-        <Child type="TextBox" skin="MW_TextEditClient" offset="4 1 502 18" align="Stretch" name="Client"/>
+        <Child type="TextBox" skin="MW_TextEditClient" offset="4 0 502 18" align="Stretch" name="Client"/>
 
     </Resource>
 
diff --git a/files/mygui/openmw_loading_screen.layout b/files/mygui/openmw_loading_screen.layout
index 92bc5aa4c..89b35d05e 100644
--- a/files/mygui/openmw_loading_screen.layout
+++ b/files/mygui/openmw_loading_screen.layout
@@ -6,7 +6,7 @@
 
         <Widget type="Widget" skin="MW_Dialog" position="0 245 300 48" align="Bottom HCenter" name="LoadingBox">
 
-            <Widget type="TextBox" skin="SandText" position="20 8 260 18" align="Stretch" name="LoadingText">
+            <Widget type="TextBox" skin="SandText" position="20 9 260 18" align="Stretch" name="LoadingText">
                 <Property key="TextAlign" value="Center"/>
             </Widget>
 
diff --git a/files/mygui/openmw_resources.xml b/files/mygui/openmw_resources.xml
index 9a6cfd038..662d78ab7 100644
--- a/files/mygui/openmw_resources.xml
+++ b/files/mygui/openmw_resources.xml
@@ -101,7 +101,7 @@
             <Property key="ModeDrop" value="true"/>
 
             <Widget type="Widget" skin="MW_Box" position="0 0 100 26" align="Stretch">
-                <Widget type="TextBox" skin="SandText" position="6 2 71 20" align="Stretch" name="Client">
+                <Widget type="TextBox" skin="SandText" position="6 3 71 20" align="Stretch" name="Client">
                     <Property key="TextAlign" value="Left VCenter"/>
                 </Widget>
                 <Widget type="ListBox" skin="MW_PopupList" position="65 38 100 200" style="Popup" layer="Popup" name="List">
diff --git a/files/mygui/openmw_savegame_dialog.layout b/files/mygui/openmw_savegame_dialog.layout
index 40288f0f5..ca11b65f8 100644
--- a/files/mygui/openmw_savegame_dialog.layout
+++ b/files/mygui/openmw_savegame_dialog.layout
@@ -45,6 +45,7 @@
                 <Widget type="AutoSizedEditBox" skin="SandText" position="0 0 263 0" name="InfoText">
                     <Property key="Static" value="true"/>
                     <Property key="MultiLine" value="true"/>
+                    <Property key="WordWrap" value="true"/>
                 </Widget>
 
 
diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml
index 89f3690ec..e539347d0 100644
--- a/files/mygui/openmw_text.skin.xml
+++ b/files/mygui/openmw_text.skin.xml
@@ -21,7 +21,7 @@ color_misc=0,205,205 # ????
     <Resource type="ResourceSkin" name="SandText" size="16 16">
         <Property key="FontName" value="Default"/>
         <Property key="TextAlign" value="Left Bottom"/>
-        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch">
+        <BasisSkin type="SimpleText" offset="0 -1 16 16" align="Stretch">
             <State name="normal" colour="#{fontcolour=normal}" shift="0"/>
         </BasisSkin>
     </Resource>

From a35d4334c386928645ebfbcbcf3b1e3750a4dfe5 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 27 Mar 2017 14:54:04 +0400
Subject: [PATCH 3/3] Encumberance text fix

---
 files/mygui/openmw_text.skin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml
index e539347d0..e442e37ee 100644
--- a/files/mygui/openmw_text.skin.xml
+++ b/files/mygui/openmw_text.skin.xml
@@ -139,7 +139,7 @@ color_misc=0,205,205 # ????
 
     <Resource type="ResourceSkin" name="MW_ChargeBar_Blue" size="204 18">
         <Child type="ProgressBar" skin="MW_Progress_Blue" offset="0 0 204 18" align="Right Top Stretch" name="Bar"/>
-        <Child type="TextBox" skin="ProgressText" offset="0 0 204 14" align="Right Top Stretch" name="BarText"/>
+        <Child type="TextBox" skin="ProgressText" offset="0 1 204 14" align="Right Top Stretch" name="BarText"/>
     </Resource>
 
     <Resource type="ResourceSkin" name="MW_DynamicStat_Red" size="204 18">