From 4e4ea23d79b6219ad197b11b9938b2fa553f91e6 Mon Sep 17 00:00:00 2001 From: otta8634 Date: Tue, 4 Feb 2025 15:03:49 +0800 Subject: [PATCH] Draw fixed keybinds darker in the menu This makes it more obvious that they're immutable. Did this by adding (COLOR|ALPHA)_KEYGRABBER_KEYS_IMMUTABLE to skinvalues. - Used the same as the *_KEYGRABBER_KEYS values, with COLOR divided by 2 roughly. --- gfx/menu/luma/skinvalues.txt | 2 ++ gfx/menu/luminos/skinvalues.txt | 2 ++ gfx/menu/wickedx/skinvalues.txt | 2 ++ gfx/menu/xaw/skinvalues.txt | 2 ++ qcsrc/menu/skin-customizables.inc | 2 ++ qcsrc/menu/xonotic/keybinder.qc | 4 ++++ 6 files changed, 14 insertions(+) diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt index 1bf37b98b..1ae0eb891 100644 --- a/gfx/menu/luma/skinvalues.txt +++ b/gfx/menu/luma/skinvalues.txt @@ -138,6 +138,8 @@ MARGIN_INPUTBOX_CHARS 1 // keygrabber ALPHA_KEYGRABBER_KEYS 0.8 COLOR_KEYGRABBER_KEYS '0.96 0.99 1' +ALPHA_KEYGRABBER_KEYS_IMMUTABLE 0.8 +COLOR_KEYGRABBER_KEYS_IMMUTABLE '0.48 0.50 0.5' ALPHA_KEYGRABBER_TITLES 1 COLOR_KEYGRABBER_TITLES '0.03 0.25 0.49' diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt index d4fdef1cd..c1e6d7fba 100755 --- a/gfx/menu/luminos/skinvalues.txt +++ b/gfx/menu/luminos/skinvalues.txt @@ -219,6 +219,8 @@ COLOR_KEYGRABBER_TITLES '1 1 1' ALPHA_KEYGRABBER_TITLES 1 COLOR_KEYGRABBER_KEYS '1 1 1' ALPHA_KEYGRABBER_KEYS 0.7 +COLOR_KEYGRABBER_KEYS_IMMUTABLE '0.5 0.5 0.5' +ALPHA_KEYGRABBER_KEYS_IMMUTABLE 0.7 // item: player color button // uses "colorbutton" images diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt index ca5e303da..39949558d 100644 --- a/gfx/menu/wickedx/skinvalues.txt +++ b/gfx/menu/wickedx/skinvalues.txt @@ -219,6 +219,8 @@ COLOR_KEYGRABBER_TITLES '1 1 1' ALPHA_KEYGRABBER_TITLES 1 COLOR_KEYGRABBER_KEYS '1 1 1' ALPHA_KEYGRABBER_KEYS 0.7 +COLOR_KEYGRABBER_KEYS_IMMUTABLE '0.5 0.5 0.5' +ALPHA_KEYGRABBER_KEYS_IMMUTABLE 0.7 // item: player color button // uses "colorbutton" images diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt index aa4350cc5..ef3f5c7e9 100644 --- a/gfx/menu/xaw/skinvalues.txt +++ b/gfx/menu/xaw/skinvalues.txt @@ -148,6 +148,8 @@ COLOR_KEYGRABBER_TITLES '1 1 1' ALPHA_KEYGRABBER_TITLES 1 COLOR_KEYGRABBER_KEYS '1 1 1' ALPHA_KEYGRABBER_KEYS 0.7 +COLOR_KEYGRABBER_KEYS_IMMUTABLE '0.5 0.5 0.5' +ALPHA_KEYGRABBER_KEYS_IMMUTABLE 0.7 // item: list box COLOR_LISTBOX_SELECTED '0 0 0' diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc index 15bd5356b..fdff26437 100644 --- a/qcsrc/menu/skin-customizables.inc +++ b/qcsrc/menu/skin-customizables.inc @@ -184,6 +184,8 @@ SKINBEGIN SKINFLOAT(ALPHA_KEYGRABBER_TITLES, 1); SKINVECTOR(COLOR_KEYGRABBER_KEYS, '1 1 1'); SKINFLOAT(ALPHA_KEYGRABBER_KEYS, 0.7); + SKINVECTOR(COLOR_KEYGRABBER_KEYS_IMMUTABLE, '0.5 0.5 0.5'); + SKINFLOAT(ALPHA_KEYGRABBER_KEYS_IMMUTABLE, 0.7); // item: list box SKINVECTOR(COLOR_LISTBOX_SELECTED, '0 0 1'); diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc index 47305e597..9e117c566 100644 --- a/qcsrc/menu/xonotic/keybinder.qc +++ b/qcsrc/menu/xonotic/keybinder.qc @@ -572,7 +572,11 @@ void XonoticKeyBinder_drawListBoxItem(entity me, int i, vector absSize, bool isS func = argv(1); } if (KEYBIND_IS_SPECIAL(func)) + { s = substring(func, 1, -1); + theColor = SKINCOLOR_KEYGRABBER_KEYS_IMMUTABLE; + theAlpha = SKINALPHA_KEYGRABBER_KEYS_IMMUTABLE; + } else { bool joy_active = cvar("joy_active"); -- 2.39.5