From 6e7bdfe329ac5d0b6d635e1301e6e8f403498ede Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 27 Apr 2019 11:57:46 +0400
Subject: [PATCH] Make progress bar close to vanilla

---
 files/mygui/openmw_hud_energybar.skin.xml | 36 ++++++-------
 files/mygui/openmw_progress.skin.xml      | 61 ++++++++---------------
 2 files changed, 39 insertions(+), 58 deletions(-)

diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml
index c3a574a47..dab5bcfb2 100644
--- a/files/mygui/openmw_hud_energybar.skin.xml
+++ b/files/mygui/openmw_hud_energybar.skin.xml
@@ -19,43 +19,43 @@
     </Resource>
 
     <!-- Progress bar track, various colors -->
-    <Resource type="AutoSizedResourceSkin" name="MW_BarTrack_Red" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_BarTrack_Red" size="16 8" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="#{fontcolour=health}"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Resource>
-    <Resource type="AutoSizedResourceSkin" name="MW_BarTrack_Green" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_BarTrack_Green" size="16 8" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="#{fontcolour=fatigue}"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Resource>
-    <Resource type="AutoSizedResourceSkin" name="MW_BarTrack_Blue" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_BarTrack_Blue" size="16 8" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="#{fontcolour=magic}"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Resource>
-    <Resource type="AutoSizedResourceSkin" name="MW_BarTrack_Yellow" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_BarTrack_Yellow" size="16 8" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="1 1 0"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Resource>
 
 
-    <Resource type="AutoSizedResourceSkin" name="MW_BarTrack_Magic" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_BarTrack_Magic" size="16 2" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="#{fontcolour=magic_fill}"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 2" align="Stretch">
+            <State name="normal" offset="0 0 16 2"/>
         </BasisSkin>
     </Resource>
 
-    <Resource type="AutoSizedResourceSkin" name="MW_BarTrack_Weapon" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_BarTrack_Weapon" size="16 2" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="#{fontcolour=weapon_fill}"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 2" align="Stretch">
+            <State name="normal" offset="0 0 16 2"/>
         </BasisSkin>
     </Resource>
 
diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
index 3e2d3916e..177b53b7a 100644
--- a/files/mygui/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -2,59 +2,40 @@
 
 <MyGUI type="Resource" version="1.1">
     <!-- Progress bar track, various colors -->
-    <Resource type="AutoSizedResourceSkin" name="MW_Track_Red" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_Track_Red" size="2 14" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="#{fontcolour=health}"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Resource>
-    <Resource type="AutoSizedResourceSkin" name="MW_Track_Blue" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_Track_Blue" size="2 14" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="#{fontcolour=magic}"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Resource>
-    <Resource type="AutoSizedResourceSkin" name="MW_Track_Green" texture="textures\menu_bar_gray.dds" >
+    <Resource type="ResourceSkin" name="MW_Track_Green" size="2 14" texture="textures\menu_bar_gray.dds" >
         <Property key="Colour" value="#{fontcolour=fatigue}"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Resource>
-    <!-- Lighter variants (only uses top half of the gradient) -->
-    <Resource type="AutoSizedResourceSkin" name="MW_BigTrack_Progress_Red_Small" texture="textures\menu_bar_gray.dds" >
-        <Property key="Colour" value="1 0 0"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
-        </BasisSkin>
-    </Resource>
-    <Resource type="AutoSizedResourceSkin" name="MW_BigTrack_Progress_Blue_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
-        <Property key="Colour" value="0.3 0.3 1"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
-        </BasisSkin>
-    </Resource>
-    <Resource type="AutoSizedResourceSkin" name="MW_BigTrack_Progress_Green_Small" texture="textures\menu_bar_gray.dds" >
-        <Property key="Colour" value="0.298 0.784 0.780"/>
-        <BasisSkin type="MainSkin" align="Stretch">
-            <State name="normal"/>
-        </BasisSkin>
-    </Resource>
-    <Resource type="ResourceSkin" name="MW_Progress_Drowning_Full_Small" size="16 8" texture="white" >
-        <Property key="Colour" value="0.035 0.545 0.545"/>
-        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
-            <State name="normal" offset="0 0 16 8"/>
+    <Resource type="ResourceSkin" name="MW_Progress_Drowning_Full_Small" size="16 2" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.235 0.745 0.745"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 2" align="Stretch">
+            <State name="normal" offset="0 0 16 2"/>
         </BasisSkin>
     </Resource>
-    <Resource type="ResourceSkin" name="MW_Progress_Drowning_Small" size="16 8" texture="white" >
-        <Property key="Colour" value="0.785 0 0"/>
-        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
-            <State name="normal" offset="0 0 16 8"/>
+    <Resource type="ResourceSkin" name="MW_Progress_Drowning_Small" size="16 2" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="1 0 0"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 2" align="Stretch">
+            <State name="normal" offset="0 0 16 2"/>
         </BasisSkin>
     </Resource>
-    <Resource type="ResourceSkin" name="MW_Progress_Loading_Small" size="16 8" texture="white" >
-        <Property key="Colour" value="0 0.615 0.620"/>
-        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
-            <State name="normal" offset="0 0 16 8"/>
+    <Resource type="ResourceSkin" name="MW_Progress_Loading_Small" size="16 2" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0 0.815 0.820"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 2" align="Stretch">
+            <State name="normal" offset="0 0 16 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="ProgressText" size="16 16">