From a2d509a4b5d419433e34aa24743d49701d42e7d8 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 8 Aug 2023 09:29:48 +0400
Subject: [PATCH] Do not use deprecated MyGUI features for scrollbars

---
 files/data/mygui/openmw_list.skin.xml | 87 ++++++++++++++-------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/files/data/mygui/openmw_list.skin.xml b/files/data/mygui/openmw_list.skin.xml
index 9ec1a9326a..75f4b9e850 100644
--- a/files/data/mygui/openmw_list.skin.xml
+++ b/files/data/mygui/openmw_list.skin.xml
@@ -4,39 +4,40 @@
 
     <!-- Horizontal Scrollbar -->
 
-    <Resource type="ResourceSkin" name="MW_HScroll" size="90 14">
-        <Property key="TrackRangeMargins" value="20 19"/>
-        <Property key="MinTrackSize" value="14"/>
-        <Property key="VerticalAlignment" value="false"/>
-        <Property key="MoveToClick" value="true"/>
-        <Property key="TrackFill" value="1"/>
+    <Resource type="ResourceLayout" name="MW_HScroll" size="90 14">
+        <Widget type="Widget" position="0 0 90 14" name="Root">
+            <Property key="WheelPage" value="36"/>
+            <Property key="ViewPage" value="36"/>
+            <Property key="Page" value="36"/>
+            <Property key="MoveToClick" value="true"/>
+            <Property key="VerticalAlignment" value="false"/>
 
-        <Property key="WheelPage" value="36"/>
-        <Property key="ViewPage" value="36"/>
-        <Property key="Page" value="36"/>
+            <UserString key="TrackFill" value="true"/>
+            <UserString key="TrackRangeMargins" value="20 19"/>
+            <UserString key="MinTrackSize" value="14"/>
 
-        <!-- Tracker must be last to be on top and receive mouse events -->
+            <!-- Tracker must be last to be on top and receive mouse events -->
 
-        <Child type="Button" skin="MW_Box" offset="18 0 54 14" align="Stretch" name="Background"/>
+            <Widget type="Button" skin="MW_Box" position="18 0 54 14" align="Stretch" name="Background" />
 
-        <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
+            <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
 
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset="14 0 24 14" align="Top HStretch" name="FirstPart"/>
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset="52 0 24 14" align="Top HStretch" name="SecondPart"/>
+            <Widget type="Button" skin="MW_ScrollEmptyPart" position="14 0 24 14" align="Top HStretch" name="FirstPart" />
+            <Widget type="Button" skin="MW_ScrollEmptyPart" position="52 0 24 14" align="Top HStretch" name="SecondPart" />
 
-        <!-- Arrows -->
+            <!-- Arrows -->
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 15 14" align="Left VStretch"/>
-        <Child type="Button" skin="MW_ArrowLeft" offset="2 2 10 10" align="Left VStretch" name="Start"/>
+            <Widget type="Widget" skin="MW_Box" position="0 0 15 14" align="Left VStretch" />
+            <Widget type="Button" skin="MW_ArrowLeft" position="2 2 10 10" align="Left VStretch" name="Start" />
 
-        <Child type="Widget" skin="MW_Box" offset="75 0 15 14" align="Right VStretch"/>
-        <Child type="Button" skin="MW_ArrowRight" offset="77 2 10 10" align="Right VStretch" name="End"/>
+            <Widget type="Widget" skin="MW_Box" position="75 0 15 14" align="Right VStretch" />
+            <Widget type="Button" skin="MW_ArrowRight" position="77 2 10 10" align="Right VStretch" name="End" />
 
-        <Child type="Button" skin="MW_ScrollTrackH" offset="38 2 30 9" align="Left VStretch" name="Track"/>
+            <Widget type="Button" skin="MW_ScrollTrackH" position="38 2 30 9" align="Left VStretch" name="Track" />
+        </Widget>
     </Resource>
 
     <Resource type="AutoSizedResourceSkin" name="MW_ScrollTrackH" texture="textures\omw_menu_scroll_center_h.dds">
-        <Property key="MinTrackSize" value="14"/>
         <BasisSkin type="TileRect" align="Stretch">
             <State name="normal">
                 <Property key="TileH" value="true"/>
@@ -47,41 +48,41 @@
 
     <!-- Vertical Scrollbar -->
 
-    <Resource type="ResourceSkin" name="MW_VScroll" size="14 90">
-        <Property key="TrackRangeMargins" value="20 19"/>
-        <Property key="MinTrackSize" value="14"/>
-        <Property key="MoveToClick" value="true"/>
-        <Property key="TrackFill" value="1"/>
-
-        <Property key="WheelPage" value="36"/>
-        <Property key="ViewPage" value="36"/>
-        <Property key="Page" value="36"/>
+    <Resource type="ResourceLayout" name="MW_VScroll" size="14 90">
+        <Widget type="Widget" position="0 0 14 90" name="Root">
+            <Property key="WheelPage" value="36"/>
+            <Property key="ViewPage" value="36"/>
+            <Property key="Page" value="36"/>
+            <Property key="MoveToClick" value="true"/>
 
-        <!-- Background widget trick that must go first to be placed behind Track and FirstPart/SecondPart widgets, provides the bar texture -->
+            <UserString key="TrackFill" value="true"/>
+            <UserString key="TrackRangeMargins" value="20 19"/>
+            <UserString key="MinTrackSize" value="14"/>
 
-        <Child type="Button" skin="MW_Box" offset="0 18 14 55" align="Stretch" name="Background"/>
+            <!-- Background widget trick that must go first to be placed behind Track and FirstPart/SecondPart widgets, provides the bar texture -->
 
-        <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
+            <Widget type="Button" skin="MW_Box" position="0 18 14 55" align="Stretch" name="Background" />
 
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset="0 14 24 14" align="Left VStretch" name="FirstPart"/>
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset="0 52 24 14" align="Left VStretch" name="SecondPart"/>
+            <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
 
-        <!-- Arrows -->
+            <Widget type="Button" skin="MW_ScrollEmptyPart" position="0 14 24 14" align="Left VStretch" name="FirstPart" />
+            <Widget type="Button" skin="MW_ScrollEmptyPart" position="0 52 24 14" align="Left VStretch" name="SecondPart" />
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 14 15" align="Top HStretch"/>
-        <Child type="Button" skin="MW_ArrowUp" offset="2 2 10 10" align="Top HStretch" name="Start"/>
+            <!-- Arrows -->
 
-        <Child type="Widget" skin="MW_Box" offset="0 76 14 15" align="Bottom HStretch"/>
-        <Child type="Button" skin="MW_ArrowDown" offset="2 78 10 10" align="Bottom HStretch" name="End"/>
+            <Widget type="Widget" skin="MW_Box" position="0 0 14 15" align="Top HStretch" />
+            <Widget type="Button" skin="MW_ArrowUp" position="2 2 10 10" align="Top HStretch" name="Start" />
 
-        <!-- Tracker must be last to be on top and receive mouse events -->
+            <Widget type="Widget" skin="MW_Box" position="0 76 14 15" align="Bottom HStretch" />
+            <Widget type="Button" skin="MW_ArrowDown" position="2 78 10 10" align="Bottom HStretch" name="End" />
 
-        <Child type="Button" skin="MW_ScrollTrackV" offset="2 40 9 30" align="Top HStretch" name="Track"/>
+            <!-- Tracker must be last to be on top and receive mouse events -->
 
+            <Widget type="Button" skin="MW_ScrollTrackV" position="2 40 9 30" align="Top HStretch" name="Track" />
+        </Widget>
     </Resource>
 
     <Resource type="AutoSizedResourceSkin" name="MW_ScrollTrackV" texture="textures\omw_menu_scroll_center_v.dds">
-        <Property key="MinTrackSize" value="14"/>
         <BasisSkin type="TileRect" align="Stretch">
             <State name="normal">
                 <Property key="TileH" value="true"/>