From 8da099713e8c7a7535a2932dfe454013feb16f85 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 1 Sep 2018 22:02:43 +0400
Subject: [PATCH] Minor layout fixes to fit different font size

---
 files/mygui/openmw_alchemy_window.layout      |  2 +-
 files/mygui/openmw_chargen_birth.layout       |  2 +-
 files/mygui/openmw_chargen_class.layout       |  6 ++--
 .../mygui/openmw_chargen_create_class.layout  |  6 ++--
 ...penmw_chargen_generate_class_result.layout |  2 +-
 files/mygui/openmw_chargen_race.layout        | 16 ++++-----
 .../openmw_chargen_select_attribute.layout    | 31 +++++++++--------
 .../mygui/openmw_chargen_select_skill.layout  | 33 ++++++++++---------
 ...penmw_chargen_select_specialization.layout | 11 ++++---
 files/mygui/openmw_container_window.layout    |  2 +-
 files/mygui/openmw_count_window.layout        |  6 ++--
 files/mygui/openmw_trade_window.layout        |  4 +--
 12 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/files/mygui/openmw_alchemy_window.layout b/files/mygui/openmw_alchemy_window.layout
index a8e5431fb..edc9a4c3d 100644
--- a/files/mygui/openmw_alchemy_window.layout
+++ b/files/mygui/openmw_alchemy_window.layout
@@ -74,7 +74,7 @@
 
         <!-- Buttons -->
 
-        <Widget type="HBox" skin="" position="110 374 452 24" align="Bottom Right">
+        <Widget type="HBox" skin="" position="110 374 452 28" align="Bottom Right">
 
             <Widget type="Spacer"/>
 
diff --git a/files/mygui/openmw_chargen_birth.layout b/files/mygui/openmw_chargen_birth.layout
index a137d83d1..18d412340 100644
--- a/files/mygui/openmw_chargen_birth.layout
+++ b/files/mygui/openmw_chargen_birth.layout
@@ -16,7 +16,7 @@
         </Widget>>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 338 511 24">
+        <Widget type="HBox" position="0 338 511 28">
             <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
                 <Property key="Caption" value="#{sBack}"/>
diff --git a/files/mygui/openmw_chargen_class.layout b/files/mygui/openmw_chargen_class.layout
index 98c8e4fde..1402d9b5c 100644
--- a/files/mygui/openmw_chargen_class.layout
+++ b/files/mygui/openmw_chargen_class.layout
@@ -27,11 +27,11 @@
             </Widget>
 
             <!-- Favorite Attributes -->
-            <Widget type="VBox" skin="" position="0 39 166 72" align="Stretch">
+            <Widget type="VBox" skin="" position="0 39 166 76" align="Stretch">
                 <Property key="Spacing" value="0"/>
 
                 <!-- Favorite Attributes -->
-                <Widget type="AutoSizedEditBox" skin="HeaderText" position="0 0 166 18" name="FavoriteAttributesT" align="Left Top">
+                <Widget type="AutoSizedEditBox" skin="HeaderText" position="0 0 166 22" name="FavoriteAttributesT" align="Left Top">
                     <Property key="Caption" value="#{sChooseClassMenu2}"/>
                     <Property key="TextAlign" value="Left Top"/>
                     <Property key="Static" value="true"/>
@@ -73,7 +73,7 @@
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 276 475 24">
+        <Widget type="HBox" position="0 276 475 28">
             <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
                 <Property key="Caption" value="#{sBack}"/>
diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout
index c04cfe064..fe491eb6d 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -11,7 +11,7 @@
             <Property key="Caption" value="#{sCustomClassName}"/>
         </Widget>
 
-        <Widget type="Widget" skin="" position="8 38 480 110" align="Stretch">
+        <Widget type="Widget" skin="" position="8 38 480 116" align="Stretch">
 
             <!-- Specialization -->
             <Widget type="TextBox" skin="HeaderText" position="0 0 156 18" name="SpecializationT" align="Left Top">
@@ -26,7 +26,7 @@
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
 
-            <Widget type="VBox" skin="" position="0 41 166 72" align="Stretch">
+            <Widget type="VBox" skin="" position="0 41 166 76" align="Stretch">
                 <Property key="Spacing" value="0"/>
 
                 <!-- Favorite Attributes -->
@@ -74,7 +74,7 @@
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 158 482 24">
+        <Widget type="HBox" position="0 158 482 28">
             <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="DescriptionButton">
                 <Property key="Caption" value="#{sCreateClassMenu1}"/>
diff --git a/files/mygui/openmw_chargen_generate_class_result.layout b/files/mygui/openmw_chargen_generate_class_result.layout
index d49f57dde..48a203b18 100644
--- a/files/mygui/openmw_chargen_generate_class_result.layout
+++ b/files/mygui/openmw_chargen_generate_class_result.layout
@@ -24,7 +24,7 @@
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 216 273 24">
+        <Widget type="HBox" position="0 216 273 28">
             <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
                 <Property key="Caption" value="#{sBack}"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout
index 31f0436d5..ea7ec6179 100644
--- a/files/mygui/openmw_chargen_race.layout
+++ b/files/mygui/openmw_chargen_race.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 588 433" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 640 433" align="Center" name="_Main">
 
         <!-- Appearance -->
         <Widget type="TextBox" skin="HeaderText" position="8 16 241 18" name="AppearanceT" align="Left Top">
@@ -54,28 +54,28 @@
 
         <!-- Race -->
 
-        <Widget type="TextBox" skin="HeaderText" position="261 16 132 18" name="RaceT" align="Left Top">
+        <Widget type="TextBox" skin="HeaderText" position="261 16 160 18" name="RaceT" align="Left Top">
             <Property key="TextAlign" value="Left Top"/>
         </Widget>
-        <Widget type="ListBox" skin="MW_List" position="264 39 132 150" name="RaceList">
+        <Widget type="ListBox" skin="MW_List" position="264 39 160 150" name="RaceList">
         </Widget>
 
         <!-- Spell powers -->
-        <Widget type="TextBox" skin="HeaderText" position="261 210 132 18" name="SpellPowerT" align="Left Top">
+        <Widget type="TextBox" skin="HeaderText" position="261 210 160 18" name="SpellPowerT" align="Left Top">
             <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <!-- Spell power sub-widgets will be placed here, no skin to make it invisible -->
-        <Widget type="Widget" skin="" position="261 230 250 140" name="SpellPowerList"/>
+        <Widget type="Widget" skin="" position="261 230 350 140" name="SpellPowerList"/>
 
         <!-- Skill bonus -->
-        <Widget type="TextBox" skin="HeaderText" position="403 39 159 18" name="SkillsT" align="Left Top">
+        <Widget type="TextBox" skin="HeaderText" position="432 39 190 18" name="SkillsT" align="Left Top">
             <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <!-- Skill bonus sub-widgets will be placed here, no skin to make it invisible -->
-        <Widget type="Widget" skin="" position="403 59 159 360" name="SkillList"/>
+        <Widget type="Widget" skin="" position="432 59 190 360" name="SkillList"/>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 393 572 24">
+        <Widget type="HBox" position="0 393 626 28">
             <Widget type="Spacer"/>
 
             <Widget type="AutoSizedButton" skin="MW_Button" position="471 397 53 23" name="BackButton">
diff --git a/files/mygui/openmw_chargen_select_attribute.layout b/files/mygui/openmw_chargen_select_attribute.layout
index 0821d4a57..57bd4ebc6 100644
--- a/files/mygui/openmw_chargen_select_attribute.layout
+++ b/files/mygui/openmw_chargen_select_attribute.layout
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 217 234" align="Center" name="_Main">
-        <Widget type="Widget" skin="" position="14 14 200 203" align="HCenter VStretch">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 247 231" align="Center" name="_Main">
+        <Widget type="Widget" skin="" position="14 14 216 204" align="HCenter VStretch">
 
             <!-- Label -->
-            <Widget type="TextBox" skin="HeaderText" position="0 0 200 18" name="LabelT" align="HCenter Top">
+            <Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="HCenter Top">
                 <Property key="Caption" value="#{sAttributesMenu1}"/>
                 <Property key="TextAlign" value="HCenter Top"/>
             </Widget>
 
             <!-- Attribute list -->
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 28 200 18" name="Attribute0" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 200 18" name="Attribute1" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 200 18" name="Attribute2" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 200 18" name="Attribute3" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 200 18" name="Attribute4" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 200 18" name="Attribute5" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 200 18" name="Attribute6" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 200 18" name="Attribute7" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 28 216 18" name="Attribute0" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 216 18" name="Attribute1" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 216 18" name="Attribute2" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 216 18" name="Attribute3" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 216 18" name="Attribute4" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 216 18" name="Attribute5" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 216 18" name="Attribute6" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 216 18" name="Attribute7" align="Left Top"/>
 
             <!-- Dialog buttons -->
-            <Widget type="AutoSizedButton" skin="MW_Button" position="120 180 66 21" name="CancelButton">
-                <Property key="ExpandDirection" value="Left"/>
-                <Property key="Caption" value="#{sCancel}"/>
+            <Widget type="HBox" position="0 175 216 28">
+                <Widget type="Spacer" />
+                <Widget type="AutoSizedButton" skin="MW_Button" align="Right Bottom" name="CancelButton">
+                    <Property key="ExpandDirection" value="Left Up"/>
+                    <Property key="Caption" value="#{sCancel}"/>
+                </Widget>
             </Widget>
 
         </Widget>
diff --git a/files/mygui/openmw_chargen_select_skill.layout b/files/mygui/openmw_chargen_select_skill.layout
index d1061882d..3737ea904 100644
--- a/files/mygui/openmw_chargen_select_skill.layout
+++ b/files/mygui/openmw_chargen_select_skill.layout
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 477 270" align="Center" name="_Main">
-        <Widget type="Widget" skin="" position="17 14 447 239" align="Stretch">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 487 275" align="Center" name="_Main">
+        <Widget type="Widget" skin="" position="17 14 457 246" align="Stretch">
 
             <!-- Label -->
-            <Widget type="TextBox" skin="HeaderText" position="0 0 447 18" name="LabelT" align="HCenter Top">
+            <Widget type="TextBox" skin="HeaderText" position="0 0 457 18" name="LabelT" align="HCenter Top">
                 <Property key="Caption" value="#{sSkillsMenu1}"/>
                 <Property key="TextAlign" value="HCenter Top"/>
             </Widget>
@@ -44,20 +44,23 @@
                 <Property key="Caption" value="#{sSpecializationStealth}"/>
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 50 131 18" name="StealthSkill0" align="Left Top"/>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 68 131 18" name="StealthSkill1" align="Left Top"/>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 86 131 18" name="StealthSkill2" align="Left Top"/>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 104 131 18" name="StealthSkill3" align="Left Top"/>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 122 131 18" name="StealthSkill4" align="Left Top"/>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 140 131 18" name="StealthSkill5" align="Left Top"/>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 158 131 18" name="StealthSkill6" align="Left Top"/>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 176 131 18" name="StealthSkill7" align="Left Top"/>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 194 131 18" name="StealthSkill8" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 50 154 18" name="StealthSkill0" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 68 154 18" name="StealthSkill1" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 86 154 18" name="StealthSkill2" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 104 154 18" name="StealthSkill3" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 122 154 18" name="StealthSkill4" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 140 154 18" name="StealthSkill5" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 158 154 18" name="StealthSkill6" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 176 154 18" name="StealthSkill7" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 194 154 18" name="StealthSkill8" align="Left Top"/>
 
             <!-- Dialog buttons -->
-            <Widget type="AutoSizedButton" skin="MW_Button" position="381 218 66 21" name="CancelButton">
-                <Property key="ExpandDirection" value="Left"/>
-                <Property key="Caption" value="#{sCancel}"/>
+            <Widget type="HBox" position="0 218 457 28">
+                <Widget type="Spacer" />
+                <Widget type="AutoSizedButton" skin="MW_Button" align="Right Bottom" name="CancelButton">
+                    <Property key="ExpandDirection" value="Left Up"/>
+                    <Property key="Caption" value="#{sCancel}"/>
+                </Widget>
             </Widget>
 
         </Widget>
diff --git a/files/mygui/openmw_chargen_select_specialization.layout b/files/mygui/openmw_chargen_select_specialization.layout
index c4fe6c631..47dc32f62 100644
--- a/files/mygui/openmw_chargen_select_specialization.layout
+++ b/files/mygui/openmw_chargen_select_specialization.layout
@@ -2,7 +2,7 @@
 <MyGUI type="Layout">
     <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
     <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 247 144" align="Center" name="_Main">
-        <Widget type="Widget" skin="" position="14 14 216 113" align="Stretch">
+        <Widget type="Widget" skin="" position="14 14 216 116" align="Stretch">
 
             <!-- Label -->
             <Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="Center Top">
@@ -22,9 +22,12 @@
             </Widget>
 
             <!-- Dialog buttons -->
-            <Widget type="AutoSizedButton" skin="MW_Button" position="150 90 66 21" name="CancelButton">
-                <Property key="ExpandDirection" value="Left"/>
-                <Property key="Caption" value="#{sCancel}"/>
+            <Widget type="HBox" position="0 88 216 28">
+                <Widget type="Spacer" />
+                <Widget type="AutoSizedButton" skin="MW_Button" align="Right Bottom" name="CancelButton">
+                    <Property key="ExpandDirection" value="Left Up"/>
+                    <Property key="Caption" value="#{sCancel}"/>
+                </Widget>
             </Widget>
 
         </Widget>
diff --git a/files/mygui/openmw_container_window.layout b/files/mygui/openmw_container_window.layout
index 6bb585e50..5783779db 100644
--- a/files/mygui/openmw_container_window.layout
+++ b/files/mygui/openmw_container_window.layout
@@ -9,7 +9,7 @@
         <Widget type="ItemView" skin="MW_ItemView" position="5 5 575 225" name="ItemView" align="Left Top Stretch">
         </Widget>
 
-        <Widget type="HBox" position="0 235 580 24" align="Right Bottom">
+        <Widget type="HBox" position="0 235 580 28" align="Right Bottom">
             <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="DisposeCorpseButton" align="Right Bottom">
                 <Property key="Caption" value="#{sDisposeofCorpse}"/>
diff --git a/files/mygui/openmw_count_window.layout b/files/mygui/openmw_count_window.layout
index 520d49fa3..2e083dcea 100644
--- a/files/mygui/openmw_count_window.layout
+++ b/files/mygui/openmw_count_window.layout
@@ -16,12 +16,12 @@
             <Property key="Page" value="1"/>
             <Property key="WheelPage" value="1"/>
         </Widget>
-        <Widget type="HBox" skin="" position="0 91 592 24" align="Center Bottom HStretch">
+        <Widget type="HBox" skin="" position="0 91 592 28" align="Center Bottom HStretch">
             <Widget type="Spacer" />
-            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 53 24" align="Left Top" name="OkButton">
+            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 53 28" align="Left Top" name="OkButton">
                 <Property key="Caption" value="#{sOk}"/>
             </Widget>
-            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 86 24" align="Right Top" name="CancelButton">
+            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 86 28" align="Right Top" name="CancelButton">
                 <Property key="Caption" value="#{sCancel}"/>
             </Widget>
             <Widget type="Spacer" />
diff --git a/files/mygui/openmw_trade_window.layout b/files/mygui/openmw_trade_window.layout
index 0af9d59fe..30e22302d 100644
--- a/files/mygui/openmw_trade_window.layout
+++ b/files/mygui/openmw_trade_window.layout
@@ -48,7 +48,7 @@
                 </Widget>
             </Widget>
 
-            <Widget type="HBox" position="0 28 566 24" align="Left Top HStretch">
+            <Widget type="HBox" position="0 28 566 28" align="Left Top HStretch">
                 <Widget type="Button" skin="MW_Button" position="0 0 40 24" name="DecreaseButton" align="Left Top">
                     <Property key="Caption" value="-"/>
                     <Property key="NeedKey" value="false"/>
@@ -62,7 +62,7 @@
                 </Widget>
             </Widget>
 
-            <Widget type="HBox" position="0 60 566 24" align="Left Bottom HStretch">
+            <Widget type="HBox" position="0 60 566 28" align="Left Bottom HStretch">
                 <Widget type="AutoSizedButton" skin="MW_Button" name="MaxSaleButton">
                     <Property key="Caption" value="#{sMaxSale}"/>
                 </Widget>