From 22987062d2345a688a8501d2b7e2dc5df393ddf0 Mon Sep 17 00:00:00 2001
From: risostk <4726939+risostk@users.noreply.github.com>
Date: Sun, 14 Jun 2020 22:00:58 -0500
Subject: [PATCH] make red team color also configurable

---
 data/skins/coal/stkskin.xml           | 4 +++-
 data/skins/forest/stkskin.xml         | 4 +++-
 data/skins/modern/stkskin.xml         | 4 +++-
 data/skins/ocean/stkskin.xml          | 4 +++-
 data/skins/peach/stkskin.xml          | 4 +++-
 data/skins/ruby/stkskin.xml           | 4 +++-
 src/guiengine/widgets/list_widget.cpp | 4 ++--
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/data/skins/coal/stkskin.xml b/data/skins/coal/stkskin.xml
index 93555b69c..9f0c21513 100644
--- a/data/skins/coal/stkskin.xml
+++ b/data/skins/coal/stkskin.xml
@@ -291,9 +291,11 @@ when the border that intersect at this corner are enabled.
 <color type="emphasis_text" state="neutral" r="230" g="210" b="50" />
 <color type="emphasis_text" state="focused" r="255" g="226" b="56" />
 
-<!-- Color used for blue items in list (e.g. player team color in networking) -->
+<!-- Color used for red/blue items in list (e.g. player team color in networking) -->
 <color type="list_blue" state="neutral" r="0" g="0" b="180" />
 <color type="list_blue" state="focused" r="0" g="0" b="255" />
+<color type="list_red" state="neutral" r="255" g="0" b="0" />
+<color type="list_red" state="focused" r="255" g="0" b="0" />
 
 <!-- Color used to fade out background when a dialog is shown -->
 <color type="dialog_background" state="neutral" a="120" r="0" g="0" b="0" />
diff --git a/data/skins/forest/stkskin.xml b/data/skins/forest/stkskin.xml
index 3c06c56f7..d3325c046 100644
--- a/data/skins/forest/stkskin.xml
+++ b/data/skins/forest/stkskin.xml
@@ -291,9 +291,11 @@ when the border that intersect at this corner are enabled.
 <color type="emphasis_text" state="neutral" r="0" g="0" b="180" />
 <color type="emphasis_text" state="focused" r="0" g="0" b="160" />
 
-<!-- Color used for blue items in list (e.g. player team color in networking) -->
+<!-- Color used for red/blue items in list (e.g. player team color in networking) -->
 <color type="list_blue" state="neutral" r="0" g="0" b="255" />
 <color type="list_blue" state="focused" r="0" g="0" b="255" />
+<color type="list_red" state="neutral" r="255" g="0" b="0" />
+<color type="list_red" state="focused" r="255" g="0" b="0" />
 
 <!-- Color used to fade out background when a dialog is shown -->
 <color type="dialog_background" state="neutral" a="120" r="0" g="0" b="0" />
diff --git a/data/skins/modern/stkskin.xml b/data/skins/modern/stkskin.xml
index 55d59c7bb..b07e6c8e2 100644
--- a/data/skins/modern/stkskin.xml
+++ b/data/skins/modern/stkskin.xml
@@ -313,9 +313,11 @@ all types of ttf.
 <color type="emphasis_text" state="neutral" r="0" g="0" b="180" />
 <color type="emphasis_text" state="focused" r="0" g="0" b="160" />
 
-<!-- Color used for blue items in list (e.g. player team color in networking) -->
+<!-- Color used for red/blue items in list (e.g. player team color in networking) -->
 <color type="list_blue" state="neutral" r="0" g="0" b="255" />
 <color type="list_blue" state="focused" r="0" g="0" b="255" />
+<color type="list_red" state="neutral" r="255" g="0" b="0" />
+<color type="list_red" state="focused" r="255" g="0" b="0" />
 
 <!-- Color used to fade out background when a dialog is shown -->
 <color type="dialog_background" state="neutral" a="120" r="0" g="0" b="0" />
diff --git a/data/skins/ocean/stkskin.xml b/data/skins/ocean/stkskin.xml
index 894d2b2e6..703e5a4e2 100644
--- a/data/skins/ocean/stkskin.xml
+++ b/data/skins/ocean/stkskin.xml
@@ -290,9 +290,11 @@ when the border that intersect at this corner are enabled.
 <color type="emphasis_text" state="neutral" r="0" g="0" b="180" />
 <color type="emphasis_text" state="focused" r="0" g="0" b="160" />
 
-<!-- Color used for blue items in list (e.g. player team color in networking) -->
+<!-- Color used for red/blue items in list (e.g. player team color in networking) -->
 <color type="list_blue" state="neutral" r="0" g="0" b="255" />
 <color type="list_blue" state="focused" r="0" g="0" b="255" />
+<color type="list_red" state="neutral" r="255" g="0" b="0" />
+<color type="list_red" state="focused" r="255" g="0" b="0" />
 
 <!-- Color used to fade out background when a dialog is shown -->
 <color type="dialog_background" state="neutral" a="120" r="0" g="0" b="0" />
diff --git a/data/skins/peach/stkskin.xml b/data/skins/peach/stkskin.xml
index 6f9278be7..125dc4e51 100644
--- a/data/skins/peach/stkskin.xml
+++ b/data/skins/peach/stkskin.xml
@@ -308,9 +308,11 @@ all types of ttf.
 <color type="emphasis_text" state="neutral" r="0" g="0" b="180" />
 <color type="emphasis_text" state="focused" r="0" g="0" b="160" />
 
-<!-- Color used for blue items in list (e.g. player team color in networking) -->
+<!-- Color used for red/blue items in list (e.g. player team color in networking) -->
 <color type="list_blue" state="neutral" r="0" g="0" b="255" />
 <color type="list_blue" state="focused" r="0" g="0" b="255" />
+<color type="list_red" state="neutral" r="255" g="0" b="0" />
+<color type="list_red" state="focused" r="255" g="0" b="0" />
 
 <!-- Color used to fade out background when a dialog is shown -->
 <color type="dialog_background" state="neutral" a="120" r="0" g="0" b="0" />
diff --git a/data/skins/ruby/stkskin.xml b/data/skins/ruby/stkskin.xml
index e3aaea679..08fd98e08 100644
--- a/data/skins/ruby/stkskin.xml
+++ b/data/skins/ruby/stkskin.xml
@@ -289,9 +289,11 @@ when the border that intersect at this corner are enabled.
 <color type="emphasis_text" state="neutral" r="0" g="0" b="180" />
 <color type="emphasis_text" state="focused" r="0" g="0" b="160" />
 
-<!-- Color used for blue items in list (e.g. player team color in networking) -->
+<!-- Color used for red/blue items in list (e.g. player team color in networking) -->
 <color type="list_blue" state="neutral" r="0" g="0" b="255" />
 <color type="list_blue" state="focused" r="0" g="0" b="255" />
+<color type="list_red" state="neutral" r="255" g="0" b="0" />
+<color type="list_red" state="focused" r="255" g="0" b="0" />
 
 <!-- Color used to fade out background when a dialog is shown -->
 <color type="dialog_background" state="neutral" a="120" r="0" g="0" b="0" />
diff --git a/src/guiengine/widgets/list_widget.cpp b/src/guiengine/widgets/list_widget.cpp
index ed148019e..b7118a77d 100644
--- a/src/guiengine/widgets/list_widget.cpp
+++ b/src/guiengine/widgets/list_widget.cpp
@@ -456,8 +456,8 @@ void ListWidget::markItemRed(const int id, bool red)
 
     if (red)
     {
-        irritem->setItemOverrideColor( id, EGUI_LBC_TEXT,           video::SColor(255,255,0,0) );
-        irritem->setItemOverrideColor( id, EGUI_LBC_TEXT_HIGHLIGHT, video::SColor(255,255,0,0) );
+        irritem->setItemOverrideColor( id, EGUI_LBC_TEXT,           GUIEngine::getSkin()->getColor("list_red::neutral"));
+        irritem->setItemOverrideColor( id, EGUI_LBC_TEXT_HIGHLIGHT, GUIEngine::getSkin()->getColor("list_red::focused"));
     }
     else
     {