From ec7b858203be3bd6acf100c5ad4e01b90c33bd74 Mon Sep 17 00:00:00 2001
From: Samual Lenks <samual@xonotic.org>
Date: Fri, 20 Dec 2013 21:34:50 -0500
Subject: [PATCH] Add skin color support for subdir colors

---
 gfx/menu/luminos/skinvalues.txt     | 6 ++++++
 gfx/menu/wickedx/skinvalues.txt     | 6 ++++++
 gfx/menu/xaw/skinvalues.txt         | 6 ++++++
 qcsrc/menu/skin-customizables.inc   | 6 ++++++
 qcsrc/menu/xonotic/demolist.c       | 2 +-
 qcsrc/menu/xonotic/screenshotlist.c | 2 +-
 6 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt
index 315d44f20..3d57ff885 100755
--- a/gfx/menu/luminos/skinvalues.txt
+++ b/gfx/menu/luminos/skinvalues.txt
@@ -138,6 +138,12 @@ COLOR_SERVERLIST_FAVORITE       '1 1 1'
 COLOR_SKINLIST_TITLE            '1 1 1'
 COLOR_SKINLIST_AUTHOR           '0.6875 0.84375 1'
 
+// item: demo list
+COLOR_DEMOLIST_SUBDIR           '0.5 0.5 0.5'
+
+// item: screenshot list
+COLOR_SCREENSHOTLIST_SUBDIR     '0.5 0.5 0.5'
+
 //------------------------------------------------------------------------------
 // Images (colors multiplied to images)
 //------------------------------------------------------------------------------
diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt
index be0ee5b0e..99d8209a5 100644
--- a/gfx/menu/wickedx/skinvalues.txt
+++ b/gfx/menu/wickedx/skinvalues.txt
@@ -138,6 +138,12 @@ COLOR_SERVERLIST_FAVORITE       '1 1 1'
 COLOR_SKINLIST_TITLE            '1 1 1'
 COLOR_SKINLIST_AUTHOR           '0 0.375 0.75'
 
+// item: demo list
+COLOR_DEMOLIST_SUBDIR           '0.5 0.5 0.5'
+
+// item: screenshot list
+COLOR_SCREENSHOTLIST_SUBDIR     '0.5 0.5 0.5'
+
 //------------------------------------------------------------------------------
 // Images (colors multiplied to images)
 //------------------------------------------------------------------------------
diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt
index d401de3e5..b9e99d777 100644
--- a/gfx/menu/xaw/skinvalues.txt
+++ b/gfx/menu/xaw/skinvalues.txt
@@ -207,6 +207,12 @@ COLOR_SERVERINFO_IP             '0 0 0'
 COLOR_SKINLIST_TITLE            '1 1 1'
 COLOR_SKINLIST_AUTHOR           '0.5 0.5 0.5'
 
+// item: demo list
+COLOR_DEMOLIST_SUBDIR           '0.5 0.5 0.5'
+
+// item: screenshot list
+COLOR_SCREENSHOTLIST_SUBDIR     '0.5 0.5 0.5'
+
 // item: slider
 //   uses "slider" images
 COLOR_SLIDER_N                  '1 1 1'
diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index 4c0a08a8c..3a3ec2dd4 100644
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -249,6 +249,12 @@ SKINBEGIN
 	SKINVECTOR(COLOR_SKINLIST_TITLE, '1 1 1');
 	SKINVECTOR(COLOR_SKINLIST_AUTHOR, '0.4 0.4 0.7');
 
+	// item: demo list
+	SKINVECTOR(COLOR_DEMOLIST_SUBDIR, '0.5 0.5 0.5');
+
+	// item: screenshot list
+	SKINVECTOR(COLOR_SCREENSHOTLIST_SUBDIR, '0.5 0.5 0.5');
+
 	// item: slider
 	SKINSTRING(GFX_SLIDER, "slider");
 	SKINVECTOR(COLOR_SLIDER_N, '1 1 1');
diff --git a/qcsrc/menu/xonotic/demolist.c b/qcsrc/menu/xonotic/demolist.c
index 9855a546a..06d8951a1 100644
--- a/qcsrc/menu/xonotic/demolist.c
+++ b/qcsrc/menu/xonotic/demolist.c
@@ -84,7 +84,7 @@ void getDemos_for_ext(entity me, string ext, float subdir)
 			if(subdir)
 			{
 				s = strreplace("/", "^7/", s); // clear colors at the forward slash
-				s = strcat("/", rgb_to_hexcolor('1 0 0'), s); // add a forward slash for sorting, then color
+				s = strcat("/", rgb_to_hexcolor(SKINCOLOR_DEMOLIST_SUBDIR), s); // add a forward slash for sorting, then color
 				bufstr_add(me.listDemo, s, TRUE);
 			}
 			else { bufstr_add(me.listDemo, s, TRUE); }
diff --git a/qcsrc/menu/xonotic/screenshotlist.c b/qcsrc/menu/xonotic/screenshotlist.c
index 907a382ef..e073c7235 100644
--- a/qcsrc/menu/xonotic/screenshotlist.c
+++ b/qcsrc/menu/xonotic/screenshotlist.c
@@ -99,7 +99,7 @@ void getScreenshots_for_ext(entity me, string ext, float subdir)
 			if(subdir)
 			{
 				s = strreplace("/", "^7/", s); // clear colors at the forward slash
-				s = strcat("/", rgb_to_hexcolor('1 0 0'), s); // add a forward slash for sorting, then color
+				s = strcat("/", rgb_to_hexcolor(SKINCOLOR_SCREENSHOTLIST_SUBDIR), s); // add a forward slash for sorting, then color
 				bufstr_add(me.listScreenshot, s, TRUE);
 			}
 			else { bufstr_add(me.listScreenshot, s, TRUE); }
-- 
2.39.2