Add skin color support for subdir colors

diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt
index 315d44f205d3ab055caf4be92e9801dcf0cbbcba..3d57ff8859eeb93d8d4f326a5ad29c1cef81854a 100755 (executable)
--- 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 be0ee5b0e2f2438aa7ff91f0327fce77640caa3b..99d8209a5985ee64d964c4d58a85d52a2210bdc7 100644 (file)
--- 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 d401de3e534e07db8b097bc9f383cb273c88c44a..b9e99d777956992761f44420f7a8e95f797725bc 100644 (file)
--- 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 4c0a08a8c57641112d9bdde34ca50a31c259484f..3a3ec2dd4a87bf8336e24d4177cfe83ae52cafa8 100644 (file)
--- 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 9855a546a08b55825f031001a2a543a532f1a2a8..06d8951a1ff144965f22eeb3c1664ebd6efc1376 100644 (file)
--- 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 907a382ef5ba955bd2ce0ada318e03f7e0d9e558..e073c7235d25a165abaa53569cb7d268026dccf4 100644 (file)
--- 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); }