From 9d80d7e71a495ba9e15940a9132c2807f716e115 Mon Sep 17 00:00:00 2001
From: Du maosen <35170687+dumaosen@users.noreply.github.com>
Date: Tue, 29 Oct 2019 20:39:34 +0800
Subject: [PATCH] Various skin fixes (#4111)

Fix #3953;
Fix #3752;
---
 data/skins/coal/stkskin.xml   | 14 ++++++--------
 data/skins/forest/stkskin.xml | 14 ++++++--------
 data/skins/ocean/stkskin.xml  | 14 ++++++--------
 data/skins/peach/stkskin.xml  | 14 ++++++--------
 data/skins/ruby/stkskin.xml   | 14 ++++++--------
 5 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/data/skins/coal/stkskin.xml b/data/skins/coal/stkskin.xml
index 5d5e69916..e39217320 100644
--- a/data/skins/coal/stkskin.xml
+++ b/data/skins/coal/stkskin.xml
@@ -90,15 +90,15 @@ when the border that intersect at this corner are enabled.
 
 <element type="button" state="neutral" image="glassbutton.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="focused" image="glassbutton_focused.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="deactivated" common="y" image="glassbutton_deactivated.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <!-- TODO : buttons could support 'pressed' state -->
 
@@ -111,12 +111,10 @@ when the border that intersect at this corner are enabled.
       hborder_out_portion="0.7" vborder_out_portion="0.3" />
       
 <element type="progress" state="fill" image="glasssgauge_fill.png"
-      left_border="20" right_border="20" top_border="0" bottom_border="0"
-      preserve_h_aspect_ratios="true" />
+      left_border="5" right_border="5" top_border="5" bottom_border="5" />
 
 <element type="progress" state="neutral" common="y" image="progress_bg.png"
-      left_border="31" right_border="31" top_border="15" bottom_border="15"
-      preserve_h_aspect_ratios="true" />
+      left_border="31" right_border="31" top_border="15" bottom_border="15" />
       
       
 <element type="tab" state="neutral" image="glasstab.png"
@@ -265,7 +263,7 @@ when the border that intersect at this corner are enabled.
 
 <!-- Stateless -->
 <element type="window" image="dialog.png"
-      left_border="7" right_border="7" top_border="50" bottom_border="50"
+      left_border="7" right_border="7" top_border="7" bottom_border="7"
       hborder_out_portion="1.0" vborder_out_portion="0.2" />
 
 <!-- Stateless -->
diff --git a/data/skins/forest/stkskin.xml b/data/skins/forest/stkskin.xml
index 23f73e35a..f30ef7665 100644
--- a/data/skins/forest/stkskin.xml
+++ b/data/skins/forest/stkskin.xml
@@ -90,15 +90,15 @@ when the border that intersect at this corner are enabled.
 
 <element type="button" state="neutral" image="glassbutton.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="focused" image="glassbutton_focused.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="deactivated" common="y" image="glassbutton_deactivated.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <!-- TODO : buttons could support 'pressed' state -->
 
@@ -111,12 +111,10 @@ when the border that intersect at this corner are enabled.
       hborder_out_portion="0.7" vborder_out_portion="0.3" />
       
 <element type="progress" state="fill" image="glasssgauge_fill.png"
-      left_border="20" right_border="20" top_border="0" bottom_border="0"
-      preserve_h_aspect_ratios="true" />
+      left_border="5" right_border="5" top_border="5" bottom_border="5" />
 
 <element type="progress" state="neutral" common="y" image="progress_bg.png"
-      left_border="31" right_border="31" top_border="15" bottom_border="15"
-      preserve_h_aspect_ratios="true" />
+      left_border="31" right_border="31" top_border="15" bottom_border="15" />
       
       
 <element type="tab" state="neutral" image="glasstab.png"
@@ -265,7 +263,7 @@ when the border that intersect at this corner are enabled.
 
 <!-- Stateless -->
 <element type="window" common="y" image="dialog.png"
-      left_border="7" right_border="7" top_border="50" bottom_border="50"
+      left_border="7" right_border="7" top_border="7" bottom_border="7"
       hborder_out_portion="1.0" vborder_out_portion="0.2" />
 
 <!-- Stateless -->
diff --git a/data/skins/ocean/stkskin.xml b/data/skins/ocean/stkskin.xml
index 01a3a8c09..b14180968 100644
--- a/data/skins/ocean/stkskin.xml
+++ b/data/skins/ocean/stkskin.xml
@@ -89,15 +89,15 @@ when the border that intersect at this corner are enabled.
 
 <element type="button" state="neutral" image="glassbutton.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="focused" image="glassbutton_focused.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="deactivated" common="y" image="glassbutton_deactivated.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <!-- TODO : buttons could support 'pressed' state -->
 
@@ -110,12 +110,10 @@ when the border that intersect at this corner are enabled.
       hborder_out_portion="0.7" vborder_out_portion="0.3" />
       
 <element type="progress" state="fill" image="glasssgauge_fill.png"
-      left_border="20" right_border="20" top_border="0" bottom_border="0"
-      preserve_h_aspect_ratios="true" />
+      left_border="5" right_border="5" top_border="5" bottom_border="5" />
 
 <element type="progress" state="neutral" common="y" image="progress_bg.png"
-      left_border="31" right_border="31" top_border="15" bottom_border="15"
-      preserve_h_aspect_ratios="true" />
+      left_border="31" right_border="31" top_border="15" bottom_border="15" />
       
       
 <element type="tab" state="neutral" image="glasstab.png"
@@ -264,7 +262,7 @@ when the border that intersect at this corner are enabled.
 
 <!-- Stateless -->
 <element type="window" common="y" image="dialog.png"
-      left_border="7" right_border="7" top_border="50" bottom_border="50"
+      left_border="7" right_border="7" top_border="7" bottom_border="7"
       hborder_out_portion="1.0" vborder_out_portion="0.2" />
 
 <!-- Stateless -->
diff --git a/data/skins/peach/stkskin.xml b/data/skins/peach/stkskin.xml
index de1b96ca1..987706460 100644
--- a/data/skins/peach/stkskin.xml
+++ b/data/skins/peach/stkskin.xml
@@ -109,15 +109,15 @@ all types of ttf.
 
 <element type="button" state="neutral" image="glassbutton.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="focused" image="glassbutton_focused.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="deactivated" common="y" image="glassbutton_deactivated.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <!-- TODO : buttons could support 'pressed' state -->
 
@@ -130,12 +130,10 @@ all types of ttf.
       hborder_out_portion="0.7" vborder_out_portion="0.3" />
 
 <element type="progress" state="fill" image="glasssgauge_fill.png"
-      left_border="15" right_border="15" top_border="15" bottom_border="15"
-      preserve_h_aspect_ratios="false" />
+      left_border="10" right_border="10" top_border="10" bottom_border="10" />
 
 <element type="progress" state="neutral" common="y" image="progress_bg.png"
-      left_border="31" right_border="31" top_border="15" bottom_border="15"
-      preserve_h_aspect_ratios="true" />
+      left_border="31" right_border="31" top_border="15" bottom_border="15" />
       
       
 <element type="tab" state="neutral" image="glasstab.png"
@@ -282,7 +280,7 @@ all types of ttf.
 
 <!-- Stateless -->
 <element type="window" common="y" image="dialog.png"
-      left_border="7" right_border="7" top_border="50" bottom_border="50"
+      left_border="7" right_border="7" top_border="7" bottom_border="7"
       hborder_out_portion="1.0" vborder_out_portion="0.2" />
 
 <!-- Stateless -->
diff --git a/data/skins/ruby/stkskin.xml b/data/skins/ruby/stkskin.xml
index cd26dbd15..04bb8955e 100644
--- a/data/skins/ruby/stkskin.xml
+++ b/data/skins/ruby/stkskin.xml
@@ -90,15 +90,15 @@ when the border that intersect at this corner are enabled.
 
 <element type="button" state="neutral" image="glassbutton.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="focused" image="glassbutton_focused.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <element type="button" state="deactivated" common="y" image="glassbutton_deactivated.png"
       left_border="13" right_border="13" top_border="13" bottom_border="13"
-      preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
+      hborder_out_portion="0" vborder_out_portion="0"/>
 
 <!-- TODO : buttons could support 'pressed' state -->
 
@@ -111,12 +111,10 @@ when the border that intersect at this corner are enabled.
       hborder_out_portion="0.7" vborder_out_portion="0.3" />
 
 <element type="progress" state="fill" image="glasssgauge_fill.png"
-      left_border="15" right_border="15" top_border="15" bottom_border="15"
-      preserve_h_aspect_ratios="false" />
+      left_border="10" right_border="10" top_border="10" bottom_border="10" />
 
 <element type="progress" state="neutral" common="y" image="progress_bg.png"
-      left_border="31" right_border="31" top_border="15" bottom_border="15"
-      preserve_h_aspect_ratios="true" />
+      left_border="31" right_border="31" top_border="15" bottom_border="15" />
       
       
 <element type="tab" state="neutral" image="glasstab.png"
@@ -263,7 +261,7 @@ when the border that intersect at this corner are enabled.
 
 <!-- Stateless -->
 <element type="window" common="y" image="dialog.png"
-      left_border="7" right_border="7" top_border="50" bottom_border="50"
+      left_border="7" right_border="7" top_border="7" bottom_border="7"
       hborder_out_portion="1.0" vborder_out_portion="0.2" />
 
 <!-- Stateless -->