From f29c4086cd575a83c1ef29b078c64e052bde3468 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sun, 12 Oct 2014 15:18:37 +0200
Subject: [PATCH 1/3] Fixes #1982: Long class names are cut off in the UI

Increased length of text filed for race, class name
in stats window, and class name cation in chargen create
class window.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
 files/mygui/openmw_chargen_create_class.layout | 2 +-
 files/mygui/openmw_stats_window.layout         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout
index dee2f4fcf7..1d071e6217 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -3,7 +3,7 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 498 198" name="_Main">
 
         <!-- Class name -->
-        <Widget type="TextBox" skin="NormalText" position="8 8 48 23" name="LabelT" align="Left Top">
+        <Widget type="TextBox" skin="NormalText" position="8 8 52 23" name="LabelT" align="Left Top">
             <Property key="Caption" value="#{sName}:"/>
             <Property key="TextAlign" value="Left VCenter"/>
         </Widget>
diff --git a/files/mygui/openmw_stats_window.layout b/files/mygui/openmw_stats_window.layout
index 6cdd4c02ae..0b8dee5c8d 100644
--- a/files/mygui/openmw_stats_window.layout
+++ b/files/mygui/openmw_stats_window.layout
@@ -89,11 +89,11 @@
                     <UserString key="ToolTipType" value="Layout"/>
                     <UserString key="ToolTipLayout" value="LevelToolTip"/>
                 </Widget>
-                <Widget type="TextBox" skin="SandTextRight" position="104 22 104 18" name="RaceText" align="Right Top">
+                <Widget type="TextBox" skin="SandTextRight" position="24 22 184 18" name="RaceText" align="Right Top">
                     <UserString key="ToolTipType" value="Layout"/>
                     <UserString key="ToolTipLayout" value="TextWithCenteredCaptionToolTip"/>
                 </Widget>
-                <Widget type="TextBox" skin="SandTextRight" position="104 40 104 18" name="ClassText" align="Right Top">
+                <Widget type="TextBox" skin="SandTextRight" position="24 40 184 18" name="ClassText" align="Right Top">
                     <UserString key="ToolTipType" value="Layout"/>
                     <UserString key="ToolTipLayout" value="ClassToolTip"/>
                 </Widget>

From 02f0b7caa38a7d2342c9dcf0fa6798b3fc507244 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Thu, 16 Oct 2014 23:22:22 +0200
Subject: [PATCH 2/3] Fixes #1982: Long class names are cut off in the UI

Added HBox widget with AutoSizedTextBox, spacer,
and TextBox for level, race, class caption and text pairs.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
 files/mygui/openmw_stats_window.layout | 66 ++++++++++++++++----------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/files/mygui/openmw_stats_window.layout b/files/mygui/openmw_stats_window.layout
index 0b8dee5c8d..df0a3f39ff 100644
--- a/files/mygui/openmw_stats_window.layout
+++ b/files/mygui/openmw_stats_window.layout
@@ -70,32 +70,50 @@
 
             <!-- Player level, race and class -->
             <Widget type="Widget" skin="MW_Box" position="8 78 212 62" align="Left Top HStretch">
-                <Widget type="TextBox" skin="NormalText" position="4 4 100 18" name="Level_str" align="Left Top HStretch">
-                    <Property key="Caption" value="#{sLevel}"/>
-                    <UserString key="ToolTipType" value="Layout"/>
-                    <UserString key="ToolTipLayout" value="LevelToolTip"/>
+                <Widget type="HBox" position="4 4 210 18" align="Left Top">
+                    <Widget type="AutoSizedTextBox" position="0 0 95 18" skin="NormalText" position="4 4 104 18" name="Level_str">
+                        <Property key="Caption" value="#{sLevel}"/>
+                        <UserString key="ToolTipType" value="Layout"/>
+                        <UserString key="ToolTipLayout" value="LevelToolTip"/>
+                    </Widget>
+                    <Widget type="Widget"> <!-- spacer -->
+                        <UserString key="HStretch" value="true"/>
+                    </Widget>
+                    <Widget type="TextBox" skin="SandTextRight" position="124 0 104 18" name="LevelText" align="Right Top HStretch">
+                        <Property key="TextAlign" value="Right Top"/>
+                        <UserString key="ToolTipType" value="Layout"/>
+                        <UserString key="ToolTipLayout" value="LevelToolTip"/>
+                    </Widget>
                 </Widget>
-                <Widget type="TextBox" skin="NormalText" position="4 22 100 18" name="Race_str" align="Left Top HStretch">
-                    <Property key="Caption" value="#{sRace}"/>
-                    <UserString key="ToolTipType" value="Layout"/>
-                    <UserString key="ToolTipLayout" value="TextWithCenteredCaptionToolTip"/>
+                <Widget type="HBox" position="4 24 210 18" align="Left Top">
+                    <Widget type="AutoSizedTextBox" position="0 0 95 18" skin="NormalText" position="4 22 100 18" name="Race_str">
+                        <Property key="Caption" value="#{sRace}"/>
+                        <UserString key="ToolTipType" value="Layout"/>
+                        <UserString key="ToolTipLayout" value="TextWithCenteredCaptionToolTip"/>
+                    </Widget>
+                    <Widget type="Widget"> <!-- spacer -->
+                        <UserString key="HStretch" value="true"/>
+                    </Widget>
+                    <Widget type="TextBox" skin="SandTextRight" position="124 0 104 18" name="RaceText" align="Right Top HStretch">
+                        <Property key="TextAlign" value="Right Top"/>
+                        <UserString key="ToolTipType" value="Layout"/>
+                        <UserString key="ToolTipLayout" value="TextWithCenteredCaptionToolTip"/>
+                    </Widget>
                 </Widget>
-                <Widget type="TextBox" skin="NormalText" position="4 40 100 18" name="Class_str" align="Left Top HStretch">
-                    <Property key="Caption" value="#{sClass}"/>
-                    <UserString key="ToolTipType" value="Layout"/>
-                    <UserString key="ToolTipLayout" value="ClassToolTip"/>
-                </Widget>
-                <Widget type="TextBox" skin="SandTextRight" position="104 4 104 18" name="LevelText" align="Right Top">
-                    <UserString key="ToolTipType" value="Layout"/>
-                    <UserString key="ToolTipLayout" value="LevelToolTip"/>
-                </Widget>
-                <Widget type="TextBox" skin="SandTextRight" position="24 22 184 18" name="RaceText" align="Right Top">
-                    <UserString key="ToolTipType" value="Layout"/>
-                    <UserString key="ToolTipLayout" value="TextWithCenteredCaptionToolTip"/>
-                </Widget>
-                <Widget type="TextBox" skin="SandTextRight" position="24 40 184 18" name="ClassText" align="Right Top">
-                    <UserString key="ToolTipType" value="Layout"/>
-                    <UserString key="ToolTipLayout" value="ClassToolTip"/>
+                <Widget type="HBox" position="4 42 210 18" align="Left Top">
+                    <Widget type="AutoSizedTextBox" position="0 0 95 18" skin="NormalText" name="Class_str">
+                        <Property key="Caption" value="#{sClass}"/>
+                        <UserString key="ToolTipType" value="Layout"/>
+                        <UserString key="ToolTipLayout" value="ClassToolTip"/>
+                    </Widget>
+                    <Widget type="Widget"> <!-- spacer -->
+                        <UserString key="HStretch" value="true"/>
+                    </Widget>
+                    <Widget type="TextBox" skin="SandTextRight" position="84 0 164 18" name="ClassText" align="Right Top HStretch">
+                        <Property key="TextAlign" value="Right Top"/>
+                        <UserString key="ToolTipType" value="Layout"/>
+                        <UserString key="ToolTipLayout" value="ClassToolTip"/>
+                    </Widget>
                 </Widget>
             </Widget>
 

From d7716e7314a4054038a5c7119d1c1f128608fa57 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sat, 25 Oct 2014 09:37:51 +0200
Subject: [PATCH 3/3] Fixes #1982: Long class names are cut off in the UI

Corrected HBox, AutoSizedTextBox and TextBox positions and alignment.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
 files/mygui/openmw_stats_window.layout | 30 ++++++++++----------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/files/mygui/openmw_stats_window.layout b/files/mygui/openmw_stats_window.layout
index df0a3f39ff..ef6db8323b 100644
--- a/files/mygui/openmw_stats_window.layout
+++ b/files/mygui/openmw_stats_window.layout
@@ -69,47 +69,39 @@
             </Widget>
 
             <!-- Player level, race and class -->
-            <Widget type="Widget" skin="MW_Box" position="8 78 212 62" align="Left Top HStretch">
-                <Widget type="HBox" position="4 4 210 18" align="Left Top">
-                    <Widget type="AutoSizedTextBox" position="0 0 95 18" skin="NormalText" position="4 4 104 18" name="Level_str">
+            <Widget type="Widget" skin="MW_Box" position="8 78 212 62" align="Top HStretch">
+                <Widget type="HBox" position="4 4 242 18" align="Left Top">
+                    <Widget type="TextBox" skin="NormalText" position="0 0 200 18" name="Level_str" align="Left Top">
                         <Property key="Caption" value="#{sLevel}"/>
                         <UserString key="ToolTipType" value="Layout"/>
                         <UserString key="ToolTipLayout" value="LevelToolTip"/>
                     </Widget>
-                    <Widget type="Widget"> <!-- spacer -->
-                        <UserString key="HStretch" value="true"/>
-                    </Widget>
-                    <Widget type="TextBox" skin="SandTextRight" position="124 0 104 18" name="LevelText" align="Right Top HStretch">
+                    <Widget type="TextBox" skin="SandTextRight" position="200 0 40 18" name="LevelText" align="Right Top">
                         <Property key="TextAlign" value="Right Top"/>
                         <UserString key="ToolTipType" value="Layout"/>
                         <UserString key="ToolTipLayout" value="LevelToolTip"/>
                     </Widget>
+
                 </Widget>
-                <Widget type="HBox" position="4 24 210 18" align="Left Top">
-                    <Widget type="AutoSizedTextBox" position="0 0 95 18" skin="NormalText" position="4 22 100 18" name="Race_str">
+                <Widget type="HBox" position="4 24 210 18" align="Top HStretch">
+                    <Widget type="AutoSizedTextBox" skin="NormalText" position="0 0 95 18" name="Race_str" align="Left Top">
                         <Property key="Caption" value="#{sRace}"/>
                         <UserString key="ToolTipType" value="Layout"/>
                         <UserString key="ToolTipLayout" value="TextWithCenteredCaptionToolTip"/>
                     </Widget>
-                    <Widget type="Widget"> <!-- spacer -->
-                        <UserString key="HStretch" value="true"/>
-                    </Widget>
-                    <Widget type="TextBox" skin="SandTextRight" position="124 0 104 18" name="RaceText" align="Right Top HStretch">
+                    <Widget type="TextBox" skin="SandTextRight" position="104 0 200 18" name="RaceText" align="Left Top">
                         <Property key="TextAlign" value="Right Top"/>
                         <UserString key="ToolTipType" value="Layout"/>
                         <UserString key="ToolTipLayout" value="TextWithCenteredCaptionToolTip"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" position="4 42 210 18" align="Left Top">
-                    <Widget type="AutoSizedTextBox" position="0 0 95 18" skin="NormalText" name="Class_str">
+                <Widget type="HBox" position="4 42 210 18" align="Top HStretch">
+                    <Widget type="AutoSizedTextBox" skin="NormalText" position="0 0 95 18" name="Class_str" align="Left Top">
                         <Property key="Caption" value="#{sClass}"/>
                         <UserString key="ToolTipType" value="Layout"/>
                         <UserString key="ToolTipLayout" value="ClassToolTip"/>
                     </Widget>
-                    <Widget type="Widget"> <!-- spacer -->
-                        <UserString key="HStretch" value="true"/>
-                    </Widget>
-                    <Widget type="TextBox" skin="SandTextRight" position="84 0 164 18" name="ClassText" align="Right Top HStretch">
+                    <Widget type="TextBox" skin="SandTextRight" position="104 0 200 18" name="ClassText" align="Left Top">
                         <Property key="TextAlign" value="Right Top"/>
                         <UserString key="ToolTipType" value="Layout"/>
                         <UserString key="ToolTipLayout" value="ClassToolTip"/>