From 374e756d80bdee08424cfab35198530ded366d74 Mon Sep 17 00:00:00 2001
From: Alayan <25536748+Alayan-stk-2@users.noreply.github.com>
Date: Fri, 5 Jul 2024 17:58:04 +0200
Subject: [PATCH] Fix selection square theming for new cartoon skins

---
 data/skins/cartoon-coal/stkskin.xml   | 11 +++++------
 data/skins/cartoon-desert/stkskin.xml |  7 +++----
 data/skins/cartoon-forest/stkskin.xml | 11 +++++------
 data/skins/cartoon-ocean/stkskin.xml  | 11 +++++------
 data/skins/cartoon-ruby/stkskin.xml   |  8 ++++----
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/data/skins/cartoon-coal/stkskin.xml b/data/skins/cartoon-coal/stkskin.xml
index 12895750a..f47e17843 100644
--- a/data/skins/cartoon-coal/stkskin.xml
+++ b/data/skins/cartoon-coal/stkskin.xml
@@ -105,25 +105,24 @@ Here you can configure advanced theming rules for this skin
       h_inner_padding="0" v_inner_padding="-8" h_margin="0" v_margin="4" />
 
 <!-- Stateless -->
-<!-- Provided by base theme
 <element type="squareFocusHaloBW" common="y" image="glass_square_focused_bw.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo1" common="y" image="glass_square_focused_red.png"
+<element type="squareFocusHalo1" common="y" image="glass_square_focused_black.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
 <element type="squareFocusHalo2" common="y" image="glass_square_focused_cyan.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo3" common="y" image="glass_square_focused_green.png"
+<element type="squareFocusHalo3" common="y" image="glass_square_focused_red.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo4" common="y" image="glass_square_focused_yellow.png"
+<element type="squareFocusHalo4" common="y" image="glass_square_focused_green.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo5" common="y" image="glass_square_focused_pink.png"
+<element type="squareFocusHalo5" common="y" image="glass_square_focused_yellow.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
-      hborder_out_portion="1.0" />-->
+      hborder_out_portion="1.0" />
       
 <!-- Stateless. No splitting into 9 areas is done; the image is just resized. -->
 <element type="selectionHalo" image="bubble.png"  />
diff --git a/data/skins/cartoon-desert/stkskin.xml b/data/skins/cartoon-desert/stkskin.xml
index 14ef57c01..eeadeff4e 100644
--- a/data/skins/cartoon-desert/stkskin.xml
+++ b/data/skins/cartoon-desert/stkskin.xml
@@ -105,11 +105,10 @@ Here you can configure advanced theming rules for this skin
       h_inner_padding="0" v_inner_padding="-8" h_margin="0" v_margin="4" />
 
 <!-- Stateless -->
-<!-- Provided by base theme
 <element type="squareFocusHaloBW" common="y" image="glass_square_focused_bw.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo1" common="y" image="glass_square_focused_red.png"
+<element type="squareFocusHalo1" common="y" image="glass_square_focused_yellow.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
 <element type="squareFocusHalo2" common="y" image="glass_square_focused_cyan.png"
@@ -118,12 +117,12 @@ Here you can configure advanced theming rules for this skin
 <element type="squareFocusHalo3" common="y" image="glass_square_focused_green.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo4" common="y" image="glass_square_focused_yellow.png"
+<element type="squareFocusHalo4" common="y" image="glass_square_focused_red.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
 <element type="squareFocusHalo5" common="y" image="glass_square_focused_pink.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
-      hborder_out_portion="1.0" />-->
+      hborder_out_portion="1.0" />
       
 <!-- Stateless. No splitting into 9 areas is done; the image is just resized. -->
 <element type="selectionHalo" image="bubble.png"  />
diff --git a/data/skins/cartoon-forest/stkskin.xml b/data/skins/cartoon-forest/stkskin.xml
index acf7ee1da..a742a4a04 100644
--- a/data/skins/cartoon-forest/stkskin.xml
+++ b/data/skins/cartoon-forest/stkskin.xml
@@ -105,25 +105,24 @@ Here you can configure advanced theming rules for this skin
       h_inner_padding="0" v_inner_padding="-8" h_margin="0" v_margin="4" />
 
 <!-- Stateless -->
-<!-- Provided by base theme
 <element type="squareFocusHaloBW" common="y" image="glass_square_focused_bw.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo1" common="y" image="glass_square_focused_red.png"
+<element type="squareFocusHalo1" common="y" image="glass_square_focused_green.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo2" common="y" image="glass_square_focused_cyan.png"
+<element type="squareFocusHalo2" common="y" image="glass_square_focused_yellow.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo3" common="y" image="glass_square_focused_green.png"
+<element type="squareFocusHalo3" common="y" image="glass_square_focused_red.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo4" common="y" image="glass_square_focused_yellow.png"
+<element type="squareFocusHalo4" common="y" image="glass_square_focused_cyan.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
 <element type="squareFocusHalo5" common="y" image="glass_square_focused_pink.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
-      hborder_out_portion="1.0" />-->
+      hborder_out_portion="1.0" />
       
 <!-- Stateless. No splitting into 9 areas is done; the image is just resized. -->
 <element type="selectionHalo" image="bubble.png"  />
diff --git a/data/skins/cartoon-ocean/stkskin.xml b/data/skins/cartoon-ocean/stkskin.xml
index e659bf230..a0781e3ae 100644
--- a/data/skins/cartoon-ocean/stkskin.xml
+++ b/data/skins/cartoon-ocean/stkskin.xml
@@ -105,25 +105,24 @@ Here you can configure advanced theming rules for this skin
       h_inner_padding="0" v_inner_padding="-8" h_margin="0" v_margin="4" />
 
 <!-- Stateless -->
-<!-- Provided by base theme
 <element type="squareFocusHaloBW" common="y" image="glass_square_focused_bw.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo1" common="y" image="glass_square_focused_red.png"
+<element type="squareFocusHalo1" common="y" image="glass_square_focused_cyan.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo2" common="y" image="glass_square_focused_cyan.png"
+<element type="squareFocusHalo2" common="y" image="glass_square_focused_yellow.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo3" common="y" image="glass_square_focused_green.png"
+<element type="squareFocusHalo3" common="y" image="glass_square_focused_red.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo4" common="y" image="glass_square_focused_yellow.png"
+<element type="squareFocusHalo4" common="y" image="glass_square_focused_green.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
 <element type="squareFocusHalo5" common="y" image="glass_square_focused_pink.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
-      hborder_out_portion="1.0" />-->
+      hborder_out_portion="1.0" />
       
 <!-- Stateless. No splitting into 9 areas is done; the image is just resized. -->
 <element type="selectionHalo" image="bubble.png"  />
diff --git a/data/skins/cartoon-ruby/stkskin.xml b/data/skins/cartoon-ruby/stkskin.xml
index e961bbc6d..05cbc381f 100644
--- a/data/skins/cartoon-ruby/stkskin.xml
+++ b/data/skins/cartoon-ruby/stkskin.xml
@@ -105,11 +105,11 @@ Here you can configure advanced theming rules for this skin
       h_inner_padding="0" v_inner_padding="-8" h_margin="0" v_margin="4" />
 
 <!-- Stateless -->
-<!-- Provided by base theme
+
 <element type="squareFocusHaloBW" common="y" image="glass_square_focused_bw.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo1" common="y" image="glass_square_focused_red.png"
+<element type="squareFocusHalo1" common="y" image="glass_square_focused_pink.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
 <element type="squareFocusHalo2" common="y" image="glass_square_focused_cyan.png"
@@ -121,9 +121,9 @@ Here you can configure advanced theming rules for this skin
 <element type="squareFocusHalo4" common="y" image="glass_square_focused_yellow.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
       hborder_out_portion="1.0" />
-<element type="squareFocusHalo5" common="y" image="glass_square_focused_pink.png"
+<element type="squareFocusHalo5" common="y" image="glass_square_focused_red.png"
       left_border="6" right_border ="6" top_border="6" bottom_border="6"
-      hborder_out_portion="1.0" />-->
+      hborder_out_portion="1.0" />
       
 <!-- Stateless. No splitting into 9 areas is done; the image is just resized. -->
 <element type="selectionHalo" image="bubble.png"  />