From 1be5ec32c27a63b33c2e096fd3afd0187ae863d7 Mon Sep 17 00:00:00 2001 From: Subhraman Sarkar Date: Thu, 16 Jan 2025 11:23:55 +0530 Subject: [PATCH] celes theme: various adjustments 1. make the gold color less bright 2. add hover states to radio and checkbox and update disabled state 3. make hover states of language and about button consistent with other buttons (white -> yellow) --- data/gui/themes/celes/widgets/_initial.cfg | 15 +++++++++++--- data/gui/themes/celes/widgets/button.cfg | 10 +++++----- .../themes/celes/widgets/label_default.cfg | 20 +++++++++---------- .../celes/widgets/toggle_button_default.cfg | 16 +++++++-------- .../celes/widgets/toggle_button_radio.cfg | 16 +++++++-------- 5 files changed, 43 insertions(+), 34 deletions(-) diff --git a/data/gui/themes/celes/widgets/_initial.cfg b/data/gui/themes/celes/widgets/_initial.cfg index 8e1438d4cc9..4f9ad7bfcfa 100644 --- a/data/gui/themes/celes/widgets/_initial.cfg +++ b/data/gui/themes/celes/widgets/_initial.cfg @@ -14,10 +14,19 @@ #define GUI__FONT_COLOR_ENABLED__BRIGHT #arg ALPHA 255 #endarg -"255, 225, 104, {ALPHA}" #enddef +"236, 202, 69, {ALPHA}" #enddef -# This gray color is used for most text when the widget is disabled. #define GUI__FONT_COLOR_DISABLED__BRIGHT #arg ALPHA 255 #endarg -"255, 225, 104, {ALPHA}" #enddef +{GUI__FONT_COLOR_DISABLED__BRIGHT ALPHA={ALPHA}} #enddef + +#define GUI__COLOR_TOGGLE_ENABLED +#arg ALPHA +255 #endarg +"44, 78, 119, {ALPHA}" #enddef + +#define GUI__COLOR_TOGGLE_DISABLED +#arg ALPHA +255 #endarg +"81, 81, 81, {ALPHA}" #enddef diff --git a/data/gui/themes/celes/widgets/button.cfg b/data/gui/themes/celes/widgets/button.cfg index 788e2522dc0..557a6f5e399 100644 --- a/data/gui/themes/celes/widgets/button.cfg +++ b/data/gui/themes/celes/widgets/button.cfg @@ -129,7 +129,7 @@ {_GUI_BUTTON_ICON {ICON}-active {IPF}} - {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE}) X={X}} + {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__BRIGHT}) X={X}} [/draw] @@ -169,7 +169,7 @@ name = "buttons/modern/normal/background.png{IPF}" [/image] - {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 255, 255, 255")} + {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE})} [/draw] @@ -187,7 +187,7 @@ name = "buttons/modern/normal/background.png~GS(){IPF}" [/image] - {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 255, 255, 255")} + {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_DISABLED__WHITE})} [/draw] @@ -205,7 +205,7 @@ name = "buttons/modern/normal/background-pressed.png{IPF}" [/image] - {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("180, 140, 0, 255")} + {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE})} [/draw] @@ -223,7 +223,7 @@ name = "buttons/modern/normal/background-active.png{IPF}" [/image] - {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 200, 0, 255")} + {_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__BRIGHT})} [/draw] diff --git a/data/gui/themes/celes/widgets/label_default.cfg b/data/gui/themes/celes/widgets/label_default.cfg index f847e67a985..d6424a31976 100644 --- a/data/gui/themes/celes/widgets/label_default.cfg +++ b/data/gui/themes/celes/widgets/label_default.cfg @@ -117,16 +117,16 @@ false [/label_definition] #enddef -{_GUI_DEFINITION "default" "default label" () DEFAULT () DEFAULT } -{_GUI_DEFINITION "default_bold" "default label, bold font" () DEFAULT "bold" DEFAULT } -{_GUI_DEFINITION "default_italic" "default label, italic font" () DEFAULT "italic" DEFAULT } -{_GUI_DEFINITION "title" "label used for titles" "script" VERY_LARGE () BRIGHT } -{_GUI_DEFINITION "default_large" "default, large font size" () LARGE () DEFAULT } -{_GUI_DEFINITION "default_huge" "default, huge font size" () HUGE () DEFAULT } -{_GUI_DEFINITION "default_small" "default, small font size" () SMALL () DEFAULT } -{_GUI_DEFINITION "default_tiny" "default, small font size" () TINY () DEFAULT } -{_GUI_DEFINITION "bad" "regular red label" () DEFAULT () BAD } -{_GUI_DEFINITION "bad_small" "small red label" () SMALL () BAD } +{_GUI_DEFINITION "default" "default label" () DEFAULT () DEFAULT } +{_GUI_DEFINITION "default_bold" "default label, bold font" () DEFAULT "bold" DEFAULT } +{_GUI_DEFINITION "default_italic" "default label, italic font" () DEFAULT "italic" DEFAULT } +{_GUI_DEFINITION "title" "label used for titles" "script" VERY_LARGE () BRIGHT } +{_GUI_DEFINITION "default_large" "default, large font size" () LARGE () DEFAULT } +{_GUI_DEFINITION "default_huge" "default, huge font size" () HUGE () DEFAULT } +{_GUI_DEFINITION "default_small" "default, small font size" () SMALL () DEFAULT } +{_GUI_DEFINITION "default_tiny" "default, small font size" () TINY () DEFAULT } +{_GUI_DEFINITION "bad" "regular red label" () DEFAULT () BAD } +{_GUI_DEFINITION "bad_small" "small red label" () SMALL () BAD } {_GUI_DEFINITION "default_outline" "default label with outline" () SMALL () DEFAULT OUTLINE=true} diff --git a/data/gui/themes/celes/widgets/toggle_button_default.cfg b/data/gui/themes/celes/widgets/toggle_button_default.cfg index 82599b77cca..33653cb7acf 100644 --- a/data/gui/themes/celes/widgets/toggle_button_default.cfg +++ b/data/gui/themes/celes/widgets/toggle_button_default.cfg @@ -16,14 +16,14 @@ [/text] #enddef -#define _GUI_CHECKBOX_BG +#define _GUI_CHECKBOX_BG COLOR [rectangle] x = 0 y = 0 w = 20 h = 20 border_thickness = 2 - border_color = "44, 78, 119, 255" + border_color = {COLOR} fill_color = "28, 45, 64, 255" [/rectangle] #enddef @@ -56,7 +56,7 @@ [draw] - {_GUI_CHECKBOX_BG} + {_GUI_CHECKBOX_BG ({GUI__COLOR_TOGGLE_ENABLED})} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE}) } [/draw] @@ -67,7 +67,7 @@ [draw] - {_GUI_CHECKBOX_BG} + {_GUI_CHECKBOX_BG ({GUI__COLOR_TOGGLE_DISABLED})} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__WHITE}) } [/draw] @@ -78,7 +78,7 @@ [draw] - {_GUI_CHECKBOX_BG} + {_GUI_CHECKBOX_BG ({GUI__FONT_COLOR_ENABLED__BRIGHT})} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE}) } [/draw] @@ -95,7 +95,7 @@ [draw] - {_GUI_CHECKBOX_BG} + {_GUI_CHECKBOX_BG ({GUI__COLOR_TOGGLE_ENABLED})} {_GUI_CHECKMARK ()} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE}) } @@ -107,7 +107,7 @@ [draw] - {_GUI_CHECKBOX_BG} + {_GUI_CHECKBOX_BG ({GUI__COLOR_TOGGLE_DISABLED})} {_GUI_CHECKMARK "~GS()"} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__WHITE}) } @@ -119,7 +119,7 @@ [draw] - {_GUI_CHECKBOX_BG} + {_GUI_CHECKBOX_BG ({GUI__FONT_COLOR_ENABLED__BRIGHT})} {_GUI_CHECKMARK ()} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE}) } diff --git a/data/gui/themes/celes/widgets/toggle_button_radio.cfg b/data/gui/themes/celes/widgets/toggle_button_radio.cfg index c88dc21aef6..5b102e155c4 100644 --- a/data/gui/themes/celes/widgets/toggle_button_radio.cfg +++ b/data/gui/themes/celes/widgets/toggle_button_radio.cfg @@ -15,13 +15,13 @@ [/text] #enddef -#define _GUI_RADIO_BG +#define _GUI_RADIO_BG COLOR [circle] x = 10 y = 10 radius = 10 border_thickness = 2 - border_color = "44, 78, 119, 255" + border_color = {COLOR} fill_color = "28, 45, 64, 255" [/circle] #enddef @@ -56,7 +56,7 @@ [draw] - {_GUI_RADIO_BG} + {_GUI_RADIO_BG ({GUI__COLOR_TOGGLE_ENABLED})} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [/draw] @@ -67,7 +67,7 @@ [draw] - {_GUI_RADIO_BG} + {_GUI_RADIO_BG ({GUI__COLOR_TOGGLE_DISABLED})} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) } [/draw] @@ -78,7 +78,7 @@ [draw] - {_GUI_RADIO_BG} + {_GUI_RADIO_BG ({GUI__FONT_COLOR_ENABLED__BRIGHT})} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [/draw] @@ -95,7 +95,7 @@ [draw] - {_GUI_RADIO_BG} + {_GUI_RADIO_BG ({GUI__COLOR_TOGGLE_ENABLED})} {_GUI_RADIO_DOT ()} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } @@ -107,7 +107,7 @@ [draw] - {_GUI_RADIO_BG} + {_GUI_RADIO_BG ({GUI__COLOR_TOGGLE_DISABLED})} {_GUI_RADIO_DOT "~GS()"} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) } @@ -119,7 +119,7 @@ [draw] - {_GUI_RADIO_BG} + {_GUI_RADIO_BG ({GUI__FONT_COLOR_ENABLED__BRIGHT})} {_GUI_RADIO_DOT ()} {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }