From e99555c356a1ecf8e5d1f62e38435fbbf4ccc09c Mon Sep 17 00:00:00 2001 From: Egmont Koblinger Date: Tue, 25 Nov 2025 14:00:42 +0100 Subject: [PATCH 1/2] Ticket #3160: Use new colors for listbox's selected entry Introduce new colors dselnormal and dselfocus for unfocused and focused listbox's selected entry, forked off from the here misused dfocus and dhotfocus, respectively. Signed-off-by: Egmont Koblinger --- lib/skin.h | 126 ++++++++++++----------- lib/skin/colors.c | 2 + lib/widget/dialog.c | 6 ++ lib/widget/dialog.h | 2 + lib/widget/listbox.c | 3 +- misc/skins/dark.ini | 2 + misc/skins/darkfar.ini | 2 + misc/skins/default.ini | 2 + misc/skins/double-lines.ini | 2 + misc/skins/featured-plus.ini | 2 + misc/skins/featured.ini | 2 + misc/skins/gotar.ini | 2 + misc/skins/gray-green-purple256.ini | 2 + misc/skins/gray-orange-blue256.ini | 2 + misc/skins/julia256.ini | 2 + misc/skins/julia256root.ini | 2 + misc/skins/mc46.ini | 2 + misc/skins/modarcon16-defbg-thin.ini | 2 + misc/skins/modarcon16-defbg.ini | 2 + misc/skins/modarcon16-thin.ini | 2 + misc/skins/modarcon16.ini | 2 + misc/skins/modarcon16root-defbg-thin.ini | 2 + misc/skins/modarcon16root-defbg.ini | 2 + misc/skins/modarcon16root-thin.ini | 2 + misc/skins/modarcon16root.ini | 2 + misc/skins/modarin256-defbg-thin.ini | 2 + misc/skins/modarin256-defbg.ini | 2 + misc/skins/modarin256-thin.ini | 2 + misc/skins/modarin256.ini | 2 + misc/skins/modarin256root-defbg-thin.ini | 2 + misc/skins/modarin256root-defbg.ini | 2 + misc/skins/modarin256root-thin.ini | 2 + misc/skins/modarin256root.ini | 2 + misc/skins/nicedark.ini | 2 + misc/skins/sand256.ini | 2 + misc/skins/seasons-autumn16M.ini | 2 + misc/skins/seasons-spring16M.ini | 2 + misc/skins/seasons-summer16M.ini | 2 + misc/skins/seasons-winter16M.ini | 2 + misc/skins/xoria256-thin.ini | 2 + misc/skins/xoria256.ini | 2 + misc/skins/xoria256root-thin.ini | 2 + misc/skins/yadt256-defbg.ini | 2 + misc/skins/yadt256.ini | 2 + 44 files changed, 154 insertions(+), 63 deletions(-) diff --git a/lib/skin.h b/lib/skin.h index 8f2c3eb1e5..0229836ede 100644 --- a/lib/skin.h +++ b/lib/skin.h @@ -25,90 +25,92 @@ #define SHADOW_COLOR mc_skin_color__cache[9] /* Dialog colors */ -#define COLOR_NORMAL mc_skin_color__cache[10] -#define COLOR_FOCUS mc_skin_color__cache[11] -#define COLOR_HOT_NORMAL mc_skin_color__cache[12] -#define COLOR_HOT_FOCUS mc_skin_color__cache[13] -#define COLOR_TITLE mc_skin_color__cache[14] +#define COLOR_NORMAL mc_skin_color__cache[10] +#define COLOR_FOCUS mc_skin_color__cache[11] +#define COLOR_HOT_NORMAL mc_skin_color__cache[12] +#define COLOR_HOT_FOCUS mc_skin_color__cache[13] +#define COLOR_SELECTED_NORMAL mc_skin_color__cache[14] +#define COLOR_SELECTED_FOCUS mc_skin_color__cache[15] +#define COLOR_TITLE mc_skin_color__cache[16] /* Error dialog colors */ -#define ERROR_COLOR mc_skin_color__cache[15] -#define ERROR_FOCUS mc_skin_color__cache[16] -#define ERROR_HOT_NORMAL mc_skin_color__cache[17] -#define ERROR_HOT_FOCUS mc_skin_color__cache[18] -#define ERROR_TITLE mc_skin_color__cache[19] +#define ERROR_COLOR mc_skin_color__cache[17] +#define ERROR_FOCUS mc_skin_color__cache[18] +#define ERROR_HOT_NORMAL mc_skin_color__cache[19] +#define ERROR_HOT_FOCUS mc_skin_color__cache[20] +#define ERROR_TITLE mc_skin_color__cache[21] /* Menu colors */ -#define MENU_ENTRY_COLOR mc_skin_color__cache[20] -#define MENU_SELECTED_COLOR mc_skin_color__cache[21] -#define MENU_HOT_COLOR mc_skin_color__cache[22] -#define MENU_HOTSEL_COLOR mc_skin_color__cache[23] -#define MENU_INACTIVE_COLOR mc_skin_color__cache[24] +#define MENU_ENTRY_COLOR mc_skin_color__cache[22] +#define MENU_SELECTED_COLOR mc_skin_color__cache[23] +#define MENU_HOT_COLOR mc_skin_color__cache[24] +#define MENU_HOTSEL_COLOR mc_skin_color__cache[25] +#define MENU_INACTIVE_COLOR mc_skin_color__cache[26] /* Popup menu colors */ -#define PMENU_ENTRY_COLOR mc_skin_color__cache[25] -#define PMENU_SELECTED_COLOR mc_skin_color__cache[26] -#define PMENU_HOT_COLOR mc_skin_color__cache[27] // unused: not implemented yet -#define PMENU_HOTSEL_COLOR mc_skin_color__cache[28] // unused: not implemented yet -#define PMENU_TITLE_COLOR mc_skin_color__cache[29] +#define PMENU_ENTRY_COLOR mc_skin_color__cache[27] +#define PMENU_SELECTED_COLOR mc_skin_color__cache[28] +#define PMENU_HOT_COLOR mc_skin_color__cache[29] // unused: not implemented yet +#define PMENU_HOTSEL_COLOR mc_skin_color__cache[30] // unused: not implemented yet +#define PMENU_TITLE_COLOR mc_skin_color__cache[31] -#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[30] -#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[31] +#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[32] +#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[33] -#define STATUSBAR_COLOR mc_skin_color__cache[32] +#define STATUSBAR_COLOR mc_skin_color__cache[34] /* * This should be selectable independently. Default has to be black background * foreground does not matter at all. */ -#define GAUGE_COLOR mc_skin_color__cache[33] -#define INPUT_COLOR mc_skin_color__cache[34] -#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[35] -#define INPUT_MARK_COLOR mc_skin_color__cache[36] -#define INPUT_HISTORY_COLOR mc_skin_color__cache[37] -#define COMMAND_HISTORY_COLOR mc_skin_color__cache[38] - -#define HELP_NORMAL_COLOR mc_skin_color__cache[39] -#define HELP_ITALIC_COLOR mc_skin_color__cache[40] -#define HELP_BOLD_COLOR mc_skin_color__cache[41] -#define HELP_LINK_COLOR mc_skin_color__cache[42] -#define HELP_SLINK_COLOR mc_skin_color__cache[43] -#define HELP_TITLE_COLOR mc_skin_color__cache[44] - -#define VIEW_NORMAL_COLOR mc_skin_color__cache[45] -#define VIEW_BOLD_COLOR mc_skin_color__cache[46] -#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[47] -#define VIEW_SELECTED_COLOR mc_skin_color__cache[48] +#define GAUGE_COLOR mc_skin_color__cache[35] +#define INPUT_COLOR mc_skin_color__cache[36] +#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[37] +#define INPUT_MARK_COLOR mc_skin_color__cache[38] +#define INPUT_HISTORY_COLOR mc_skin_color__cache[39] +#define COMMAND_HISTORY_COLOR mc_skin_color__cache[40] + +#define HELP_NORMAL_COLOR mc_skin_color__cache[41] +#define HELP_ITALIC_COLOR mc_skin_color__cache[42] +#define HELP_BOLD_COLOR mc_skin_color__cache[43] +#define HELP_LINK_COLOR mc_skin_color__cache[44] +#define HELP_SLINK_COLOR mc_skin_color__cache[45] +#define HELP_TITLE_COLOR mc_skin_color__cache[46] + +#define VIEW_NORMAL_COLOR mc_skin_color__cache[47] +#define VIEW_BOLD_COLOR mc_skin_color__cache[48] +#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[49] +#define VIEW_SELECTED_COLOR mc_skin_color__cache[50] /* * editor colors - only 4 for normal, search->found, select, and whitespace * respectively * Last is defined to view color. */ -#define EDITOR_NORMAL_COLOR mc_skin_color__cache[49] -#define EDITOR_NONPRINTABLE_COLOR mc_skin_color__cache[50] -#define EDITOR_BOLD_COLOR mc_skin_color__cache[51] -#define EDITOR_MARKED_COLOR mc_skin_color__cache[52] -#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[53] -#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[54] -#define EDITOR_BACKGROUND mc_skin_color__cache[55] -#define EDITOR_FRAME mc_skin_color__cache[56] -#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[57] -#define EDITOR_FRAME_DRAG mc_skin_color__cache[58] +#define EDITOR_NORMAL_COLOR mc_skin_color__cache[51] +#define EDITOR_NONPRINTABLE_COLOR mc_skin_color__cache[52] +#define EDITOR_BOLD_COLOR mc_skin_color__cache[53] +#define EDITOR_MARKED_COLOR mc_skin_color__cache[54] +#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[55] +#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[56] +#define EDITOR_BACKGROUND mc_skin_color__cache[57] +#define EDITOR_FRAME mc_skin_color__cache[58] +#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[59] +#define EDITOR_FRAME_DRAG mc_skin_color__cache[60] /* color of left 8 char status per line */ -#define LINE_STATE_COLOR mc_skin_color__cache[59] -#define BOOK_MARK_COLOR mc_skin_color__cache[60] -#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[61] +#define LINE_STATE_COLOR mc_skin_color__cache[61] +#define BOOK_MARK_COLOR mc_skin_color__cache[62] +#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[63] /* Diff colors */ -#define DFF_ADD_COLOR mc_skin_color__cache[62] -#define DFF_CHG_COLOR mc_skin_color__cache[63] -#define DFF_CHH_COLOR mc_skin_color__cache[64] -#define DFF_CHD_COLOR mc_skin_color__cache[65] -#define DFF_DEL_COLOR mc_skin_color__cache[66] -#define DFF_ERROR_COLOR mc_skin_color__cache[67] - -#define MC_SKIN_COLOR_CACHE_COUNT 68 +#define DFF_ADD_COLOR mc_skin_color__cache[64] +#define DFF_CHG_COLOR mc_skin_color__cache[65] +#define DFF_CHH_COLOR mc_skin_color__cache[66] +#define DFF_CHD_COLOR mc_skin_color__cache[67] +#define DFF_DEL_COLOR mc_skin_color__cache[68] +#define DFF_ERROR_COLOR mc_skin_color__cache[69] + +#define MC_SKIN_COLOR_CACHE_COUNT 70 /*** enums ***************************************************************************************/ diff --git a/lib/skin/colors.c b/lib/skin/colors.c index 274df2bd1c..9748c899cc 100644 --- a/lib/skin/colors.c +++ b/lib/skin/colors.c @@ -259,6 +259,8 @@ mc_skin_color_cache_init (void) COLOR_FOCUS = mc_skin_color_get ("dialog", "dfocus"); COLOR_HOT_NORMAL = mc_skin_color_get ("dialog", "dhotnormal"); COLOR_HOT_FOCUS = mc_skin_color_get ("dialog", "dhotfocus"); + COLOR_SELECTED_NORMAL = mc_skin_color_get ("dialog", "dselnormal"); + COLOR_SELECTED_FOCUS = mc_skin_color_get ("dialog", "dselfocus"); COLOR_TITLE = mc_skin_color_get ("dialog", "dtitle"); ERROR_COLOR = mc_skin_color_get ("error", "_default_"); diff --git a/lib/widget/dialog.c b/lib/widget/dialog.c index 9149e59c68..f19f80ef11 100644 --- a/lib/widget/dialog.c +++ b/lib/widget/dialog.c @@ -456,18 +456,24 @@ dlg_set_default_colors (void) dialog_colors[DLG_COLOR_FOCUS] = COLOR_FOCUS; dialog_colors[DLG_COLOR_HOT_NORMAL] = COLOR_HOT_NORMAL; dialog_colors[DLG_COLOR_HOT_FOCUS] = COLOR_HOT_FOCUS; + dialog_colors[DLG_COLOR_SELECTED_NORMAL] = COLOR_SELECTED_NORMAL; + dialog_colors[DLG_COLOR_SELECTED_FOCUS] = COLOR_SELECTED_FOCUS; dialog_colors[DLG_COLOR_TITLE] = COLOR_TITLE; alarm_colors[DLG_COLOR_NORMAL] = ERROR_COLOR; alarm_colors[DLG_COLOR_FOCUS] = ERROR_FOCUS; alarm_colors[DLG_COLOR_HOT_NORMAL] = ERROR_HOT_NORMAL; alarm_colors[DLG_COLOR_HOT_FOCUS] = ERROR_HOT_FOCUS; + alarm_colors[DLG_COLOR_SELECTED_NORMAL] = ERROR_HOT_FOCUS; // unused + alarm_colors[DLG_COLOR_SELECTED_FOCUS] = ERROR_FOCUS; // unused alarm_colors[DLG_COLOR_TITLE] = ERROR_TITLE; listbox_colors[DLG_COLOR_NORMAL] = PMENU_ENTRY_COLOR; listbox_colors[DLG_COLOR_FOCUS] = PMENU_SELECTED_COLOR; listbox_colors[DLG_COLOR_HOT_NORMAL] = PMENU_ENTRY_COLOR; listbox_colors[DLG_COLOR_HOT_FOCUS] = PMENU_SELECTED_COLOR; + listbox_colors[DLG_COLOR_SELECTED_NORMAL] = PMENU_SELECTED_COLOR; // unused + listbox_colors[DLG_COLOR_SELECTED_FOCUS] = PMENU_SELECTED_COLOR; // unused listbox_colors[DLG_COLOR_TITLE] = PMENU_TITLE_COLOR; } diff --git a/lib/widget/dialog.h b/lib/widget/dialog.h index a4bdf405ff..d55b24fb1c 100644 --- a/lib/widget/dialog.h +++ b/lib/widget/dialog.h @@ -37,6 +37,8 @@ typedef enum DLG_COLOR_FOCUS, DLG_COLOR_HOT_NORMAL, DLG_COLOR_HOT_FOCUS, + DLG_COLOR_SELECTED_NORMAL, + DLG_COLOR_SELECTED_FOCUS, DLG_COLOR_TITLE, DLG_COLOR_COUNT } dlg_colors_enum_t; diff --git a/lib/widget/listbox.c b/lib/widget/listbox.c index 10e9e1bcd7..771ba1b474 100644 --- a/lib/widget/listbox.c +++ b/lib/widget/listbox.c @@ -148,7 +148,8 @@ listbox_draw (WListbox *l, gboolean focused) disabled = widget_get_state (wl, WST_DISABLED); normalc = disabled ? DISABLED_COLOR : colors[DLG_COLOR_NORMAL]; - selc = disabled ? DISABLED_COLOR : colors[focused ? DLG_COLOR_HOT_FOCUS : DLG_COLOR_FOCUS]; + selc = disabled ? DISABLED_COLOR + : colors[focused ? DLG_COLOR_SELECTED_FOCUS : DLG_COLOR_SELECTED_NORMAL]; if (l->list != NULL) { diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini index 9df827d300..bb539fae29 100644 --- a/misc/skins/dark.ini +++ b/misc/skins/dark.ini @@ -46,6 +46,8 @@ dfocus = blue;cyan dhotnormal = white; dhotfocus = white;cyan + dselnormal = blue;cyan + dselfocus = white;cyan dtitle = white; [error] diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini index 445bc48543..9b2517728e 100644 --- a/misc/skins/darkfar.ini +++ b/misc/skins/darkfar.ini @@ -46,6 +46,8 @@ dfocus = blue;cyan dhotnormal = white; dhotfocus = white;cyan + dselnormal = blue;cyan + dselfocus = white;cyan dtitle = white; [error] diff --git a/misc/skins/default.ini b/misc/skins/default.ini index 22e8694a87..1994cbaa3b 100644 --- a/misc/skins/default.ini +++ b/misc/skins/default.ini @@ -46,6 +46,8 @@ dfocus = black;cyan dhotnormal = blue;lightgray dhotfocus = blue;cyan + dselnormal = black;cyan + dselfocus = blue;cyan dtitle = blue;lightgray [error] diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini index fa1d2ea44f..c6756a44f3 100644 --- a/misc/skins/double-lines.ini +++ b/misc/skins/double-lines.ini @@ -46,6 +46,8 @@ dfocus = black;cyan dhotnormal = blue;lightgray dhotfocus = blue;cyan + dselnormal = black;cyan + dselfocus = blue;cyan dtitle = blue;lightgray [error] diff --git a/misc/skins/featured-plus.ini b/misc/skins/featured-plus.ini index 33813bf1b9..d1afdbf380 100644 --- a/misc/skins/featured-plus.ini +++ b/misc/skins/featured-plus.ini @@ -48,6 +48,8 @@ dfocus = black;cyan dhotnormal = blue;lightgray dhotfocus = blue;cyan + dselnormal = black;cyan + dselfocus = blue;cyan dtitle = blue;lightgray [error] diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini index 51bcedfb6d..f125d13ebb 100644 --- a/misc/skins/featured.ini +++ b/misc/skins/featured.ini @@ -48,6 +48,8 @@ dfocus = black;cyan dhotnormal = blue;lightgray dhotfocus = blue;cyan + dselnormal = black;cyan + dselfocus = blue;cyan dtitle = blue;lightgray [error] diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini index 0bdf4e8f06..738fce2cf7 100644 --- a/misc/skins/gotar.ini +++ b/misc/skins/gotar.ini @@ -43,6 +43,8 @@ dfocus = brightred;black dhotnormal = brightred; dhotfocus = yellow;black + dselnormal = brightred;black + dselfocus = yellow;black dtitle = brightred; [error] diff --git a/misc/skins/gray-green-purple256.ini b/misc/skins/gray-green-purple256.ini index c0bcdc9ee2..0f7c11ad28 100644 --- a/misc/skins/gray-green-purple256.ini +++ b/misc/skins/gray-green-purple256.ini @@ -52,6 +52,8 @@ dfocus = ;main1 dhotnormal = main2 dhotfocus = main2;main1 + dselnormal = ;main1 + dselfocus = main2;main1 dtitle = main2 [error] diff --git a/misc/skins/gray-orange-blue256.ini b/misc/skins/gray-orange-blue256.ini index b8c0b9a40c..b2c2f80ceb 100644 --- a/misc/skins/gray-orange-blue256.ini +++ b/misc/skins/gray-orange-blue256.ini @@ -52,6 +52,8 @@ dfocus = ;main1 dhotnormal = main2 dhotfocus = main2;main1 + dselnormal = ;main1 + dselfocus = main2;main1 dtitle = main2 [error] diff --git a/misc/skins/julia256.ini b/misc/skins/julia256.ini index 1e42ecec50..8caafb3162 100644 --- a/misc/skins/julia256.ini +++ b/misc/skins/julia256.ini @@ -49,6 +49,8 @@ dfocus = black;cyan dhotnormal = red; dhotfocus = red;cyan + dselnormal = black;cyan + dselfocus = red;cyan dtitle = black; [error] diff --git a/misc/skins/julia256root.ini b/misc/skins/julia256root.ini index 03ecd9b39a..edfdf27187 100644 --- a/misc/skins/julia256root.ini +++ b/misc/skins/julia256root.ini @@ -49,6 +49,8 @@ dfocus = black;cyan dhotnormal = red; dhotfocus = red;cyan + dselnormal = black;cyan + dselfocus = red;cyan dtitle = black; [error] diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini index dbae4af975..8c3b959b34 100644 --- a/misc/skins/mc46.ini +++ b/misc/skins/mc46.ini @@ -46,6 +46,8 @@ dfocus = black;cyan dhotnormal = blue;lightgray dhotfocus = blue;cyan + dselnormal = black;cyan + dselfocus = blue;cyan dtitle = blue;lightgray [error] diff --git a/misc/skins/modarcon16-defbg-thin.ini b/misc/skins/modarcon16-defbg-thin.ini index 0a87732439..bdcf21dc54 100644 --- a/misc/skins/modarcon16-defbg-thin.ini +++ b/misc/skins/modarcon16-defbg-thin.ini @@ -87,6 +87,8 @@ dhotnormal = color3 dfocus = color11;color2;bold dhotfocus = color3;color2 + dselnormal = color11;color2;bold + dselfocus = color3;color2 dtitle = color11;;bold [error] diff --git a/misc/skins/modarcon16-defbg.ini b/misc/skins/modarcon16-defbg.ini index 27202966b8..b2f4ca518f 100644 --- a/misc/skins/modarcon16-defbg.ini +++ b/misc/skins/modarcon16-defbg.ini @@ -88,6 +88,8 @@ dhotnormal = color3 dfocus = color11;color2;bold dhotfocus = color3;color2 + dselnormal = color11;color2;bold + dselfocus = color3;color2 dtitle = color11;;bold [error] diff --git a/misc/skins/modarcon16-thin.ini b/misc/skins/modarcon16-thin.ini index 8495f3a4a7..840994a584 100644 --- a/misc/skins/modarcon16-thin.ini +++ b/misc/skins/modarcon16-thin.ini @@ -87,6 +87,8 @@ dhotnormal = color3 dfocus = color11;color2;bold dhotfocus = color3;color2 + dselnormal = color11;color2;bold + dselfocus = color3;color2 dtitle = color11;;bold [error] diff --git a/misc/skins/modarcon16.ini b/misc/skins/modarcon16.ini index 98e5628d70..e5c81b5ea2 100644 --- a/misc/skins/modarcon16.ini +++ b/misc/skins/modarcon16.ini @@ -88,6 +88,8 @@ dhotnormal = color3 dfocus = color11;color2;bold dhotfocus = color3;color2 + dselnormal = color11;color2;bold + dselfocus = color3;color2 dtitle = color11;;bold [error] diff --git a/misc/skins/modarcon16root-defbg-thin.ini b/misc/skins/modarcon16root-defbg-thin.ini index 47ecd76f39..36dfcc7801 100644 --- a/misc/skins/modarcon16root-defbg-thin.ini +++ b/misc/skins/modarcon16root-defbg-thin.ini @@ -87,6 +87,8 @@ dhotnormal = color3 dfocus = color11;color1;bold dhotfocus = color5;color1;bold + dselnormal = color11;color1;bold + dselfocus = color5;color1;bold dtitle = color11;;bold [error] diff --git a/misc/skins/modarcon16root-defbg.ini b/misc/skins/modarcon16root-defbg.ini index 0b410ad1e6..554517fb4e 100644 --- a/misc/skins/modarcon16root-defbg.ini +++ b/misc/skins/modarcon16root-defbg.ini @@ -88,6 +88,8 @@ dhotnormal = color3 dfocus = color11;color1;bold dhotfocus = color5;color1;bold + dselnormal = color11;color1;bold + dselfocus = color5;color1;bold dtitle = color11;;bold [error] diff --git a/misc/skins/modarcon16root-thin.ini b/misc/skins/modarcon16root-thin.ini index 37dc8c9b20..bf85a800de 100644 --- a/misc/skins/modarcon16root-thin.ini +++ b/misc/skins/modarcon16root-thin.ini @@ -87,6 +87,8 @@ dhotnormal = color3 dfocus = color11;color1;bold dhotfocus = color5;color1;bold + dselnormal = color11;color1;bold + dselfocus = color5;color1;bold dtitle = color11;;bold [error] diff --git a/misc/skins/modarcon16root.ini b/misc/skins/modarcon16root.ini index e0e757d3f5..a4e5cb4f12 100644 --- a/misc/skins/modarcon16root.ini +++ b/misc/skins/modarcon16root.ini @@ -88,6 +88,8 @@ dhotnormal = color3 dfocus = color11;color1;bold dhotfocus = color5;color1;bold + dselnormal = color11;color1;bold + dselfocus = color5;color1;bold dtitle = color11;;bold [error] diff --git a/misc/skins/modarin256-defbg-thin.ini b/misc/skins/modarin256-defbg-thin.ini index f9d9e4d55f..6303a62094 100644 --- a/misc/skins/modarin256-defbg-thin.ini +++ b/misc/skins/modarin256-defbg-thin.ini @@ -87,6 +87,8 @@ dhotnormal = color214 dfocus = color228;color23;bold dhotfocus = color214;color23 + dselnormal = color228;color23;bold + dselfocus = color214;color23 dtitle = color180;;bold [error] diff --git a/misc/skins/modarin256-defbg.ini b/misc/skins/modarin256-defbg.ini index b2b71117dc..ac5b0d49d4 100644 --- a/misc/skins/modarin256-defbg.ini +++ b/misc/skins/modarin256-defbg.ini @@ -88,6 +88,8 @@ dhotnormal = color214 dfocus = color228;color23;bold dhotfocus = color214;color23 + dselnormal = color228;color23;bold + dselfocus = color214;color23 dtitle = color180;;bold [error] diff --git a/misc/skins/modarin256-thin.ini b/misc/skins/modarin256-thin.ini index 471581012e..3724fb76c3 100644 --- a/misc/skins/modarin256-thin.ini +++ b/misc/skins/modarin256-thin.ini @@ -87,6 +87,8 @@ dhotnormal = color214 dfocus = color228;color23;bold dhotfocus = color214;color23 + dselnormal = color228;color23;bold + dselfocus = color214;color23 dtitle = color180;;bold [error] diff --git a/misc/skins/modarin256.ini b/misc/skins/modarin256.ini index 522882745d..c2eacfdf3a 100644 --- a/misc/skins/modarin256.ini +++ b/misc/skins/modarin256.ini @@ -88,6 +88,8 @@ dhotnormal = color214 dfocus = color228;color23;bold dhotfocus = color214;color23 + dselnormal = color228;color23;bold + dselfocus = color214;color23 dtitle = color180;;bold [error] diff --git a/misc/skins/modarin256root-defbg-thin.ini b/misc/skins/modarin256root-defbg-thin.ini index 88376d0c6c..d403ba1917 100644 --- a/misc/skins/modarin256root-defbg-thin.ini +++ b/misc/skins/modarin256root-defbg-thin.ini @@ -87,6 +87,8 @@ dhotnormal = color214 dfocus = color228;color88;bold dhotfocus = color214;color88;bold + dselnormal = color228;color88;bold + dselfocus = color214;color88;bold dtitle = color180;;bold [error] diff --git a/misc/skins/modarin256root-defbg.ini b/misc/skins/modarin256root-defbg.ini index f006e6fff5..733d00abee 100644 --- a/misc/skins/modarin256root-defbg.ini +++ b/misc/skins/modarin256root-defbg.ini @@ -88,6 +88,8 @@ dhotnormal = color214 dfocus = color228;color88;bold dhotfocus = color214;color88;bold + dselnormal = color228;color88;bold + dselfocus = color214;color88;bold dtitle = color180;;bold [error] diff --git a/misc/skins/modarin256root-thin.ini b/misc/skins/modarin256root-thin.ini index ecdab3b3af..c40f6e9199 100644 --- a/misc/skins/modarin256root-thin.ini +++ b/misc/skins/modarin256root-thin.ini @@ -87,6 +87,8 @@ dhotnormal = color214 dfocus = color228;color88;bold dhotfocus = color214;color88;bold + dselnormal = color228;color88;bold + dselfocus = color214;color88;bold dtitle = color180;;bold [error] diff --git a/misc/skins/modarin256root.ini b/misc/skins/modarin256root.ini index 06c8d369fd..e72c0875b5 100644 --- a/misc/skins/modarin256root.ini +++ b/misc/skins/modarin256root.ini @@ -88,6 +88,8 @@ dhotnormal = color214 dfocus = color228;color88;bold dhotfocus = color214;color88;bold + dselnormal = color228;color88;bold + dselfocus = color214;color88;bold dtitle = color180;;bold [error] diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini index 19c6a196f8..dc244a25e7 100644 --- a/misc/skins/nicedark.ini +++ b/misc/skins/nicedark.ini @@ -46,6 +46,8 @@ dfocus = lightgray;blue dhotnormal = brown;black dhotfocus = brown;blue + dselnormal = lightgray;blue + dselfocus = brown;blue dtitle = brown;black [error] diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini index 91c8c57c77..17c4b2db72 100644 --- a/misc/skins/sand256.ini +++ b/misc/skins/sand256.ini @@ -96,6 +96,8 @@ dfocus = ;rgb452 dhotnormal = ;;underline dhotfocus = ;rgb452;underline + dselnormal = ;rgb452 + dselfocus = ;rgb452;underline dtitle = ;;italic+underline [error] diff --git a/misc/skins/seasons-autumn16M.ini b/misc/skins/seasons-autumn16M.ini index 3d70bdf8b3..9fe36087ef 100644 --- a/misc/skins/seasons-autumn16M.ini +++ b/misc/skins/seasons-autumn16M.ini @@ -99,6 +99,8 @@ dfocus = ;DialogFocus dhotnormal = ;;underline dhotfocus = ;DialogFocus;underline + dselnormal = ;DialogFocus + dselfocus = ;DialogFocus;underline dtitle = ;;bold [error] diff --git a/misc/skins/seasons-spring16M.ini b/misc/skins/seasons-spring16M.ini index 1334f89c75..b7848a7223 100644 --- a/misc/skins/seasons-spring16M.ini +++ b/misc/skins/seasons-spring16M.ini @@ -99,6 +99,8 @@ dfocus = ;DialogFocus dhotnormal = ;;underline dhotfocus = ;DialogFocus;underline + dselnormal = ;DialogFocus + dselfocus = ;DialogFocus;underline dtitle = ;;bold [error] diff --git a/misc/skins/seasons-summer16M.ini b/misc/skins/seasons-summer16M.ini index 16a0f3f110..e33d99f6ba 100644 --- a/misc/skins/seasons-summer16M.ini +++ b/misc/skins/seasons-summer16M.ini @@ -99,6 +99,8 @@ dfocus = ;DialogFocus dhotnormal = ;;underline dhotfocus = ;DialogFocus;underline + dselnormal = ;DialogFocus + dselfocus = ;DialogFocus;underline dtitle = ;;bold [error] diff --git a/misc/skins/seasons-winter16M.ini b/misc/skins/seasons-winter16M.ini index 130f4702d0..d41cb990bf 100644 --- a/misc/skins/seasons-winter16M.ini +++ b/misc/skins/seasons-winter16M.ini @@ -99,6 +99,8 @@ dfocus = ;DialogFocus dhotnormal = ;;underline dhotfocus = ;DialogFocus;underline + dselnormal = ;DialogFocus + dselfocus = ;DialogFocus;underline dtitle = ;;bold [error] diff --git a/misc/skins/xoria256-thin.ini b/misc/skins/xoria256-thin.ini index dd4ab08020..56d3e251ea 100644 --- a/misc/skins/xoria256-thin.ini +++ b/misc/skins/xoria256-thin.ini @@ -66,6 +66,8 @@ dhotnormal = color88;; dfocus = black;color73; dhotfocus = color88;color73; + dselnormal = black;color73; + dselfocus = color88;color73; dtitle = color235;;bold [error] diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini index ad1055a910..686fd6dee6 100644 --- a/misc/skins/xoria256.ini +++ b/misc/skins/xoria256.ini @@ -66,6 +66,8 @@ dhotnormal = color88;; dfocus = black;color73; dhotfocus = color88;color73; + dselnormal = black;color73; + dselfocus = color88;color73; dtitle = color235;;bold [error] diff --git a/misc/skins/xoria256root-thin.ini b/misc/skins/xoria256root-thin.ini index e1f118f1dc..d2f7b1d6f3 100644 --- a/misc/skins/xoria256root-thin.ini +++ b/misc/skins/xoria256root-thin.ini @@ -66,6 +66,8 @@ dhotnormal = color88;; dfocus = black;color73; dhotfocus = color88;color73; + dselnormal = black;color73; + dselfocus = color88;color73; dtitle = color235;;bold [error] diff --git a/misc/skins/yadt256-defbg.ini b/misc/skins/yadt256-defbg.ini index def3a44ea2..39a6d7b432 100644 --- a/misc/skins/yadt256-defbg.ini +++ b/misc/skins/yadt256-defbg.ini @@ -55,6 +55,8 @@ dhotnormal = color214 dfocus = color228;blue;bold dhotfocus = color214;blue + dselnormal = color228;blue;bold + dselfocus = color214;blue dtitle = color180;;bold [error] diff --git a/misc/skins/yadt256.ini b/misc/skins/yadt256.ini index 0ddc012cbc..8e21545f83 100644 --- a/misc/skins/yadt256.ini +++ b/misc/skins/yadt256.ini @@ -54,6 +54,8 @@ dhotnormal = color214 dfocus = color228;blue;bold dhotfocus = color214;blue + dselnormal = color228;blue;bold + dselfocus = color214;blue dtitle = color180;;bold [error] From 27fbae946ad8804579d3cde570bca6cd1aba8625 Mon Sep 17 00:00:00 2001 From: Egmont Koblinger Date: Tue, 25 Nov 2025 14:03:26 +0100 Subject: [PATCH 2/2] Ticket #3160: Adjust skins not the underline listbox's selected entry Signed-off-by: Egmont Koblinger --- misc/skins/sand256.ini | 4 ++-- misc/skins/seasons-autumn16M.ini | 2 +- misc/skins/seasons-spring16M.ini | 2 +- misc/skins/seasons-summer16M.ini | 2 +- misc/skins/seasons-winter16M.ini | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini index 17c4b2db72..105e89432d 100644 --- a/misc/skins/sand256.ini +++ b/misc/skins/sand256.ini @@ -97,7 +97,7 @@ dhotnormal = ;;underline dhotfocus = ;rgb452;underline dselnormal = ;rgb452 - dselfocus = ;rgb452;underline + dselfocus = ;rgb452 dtitle = ;;italic+underline [error] @@ -135,7 +135,7 @@ [popupmenu] _default_ = black;rgb553 - menusel = ;rgb452;underline + menusel = ;rgb452 menutitle = ;;italic+underline [buttonbar] diff --git a/misc/skins/seasons-autumn16M.ini b/misc/skins/seasons-autumn16M.ini index 9fe36087ef..a7547b9fc8 100644 --- a/misc/skins/seasons-autumn16M.ini +++ b/misc/skins/seasons-autumn16M.ini @@ -100,7 +100,7 @@ dhotnormal = ;;underline dhotfocus = ;DialogFocus;underline dselnormal = ;DialogFocus - dselfocus = ;DialogFocus;underline + dselfocus = ;DialogFocus dtitle = ;;bold [error] diff --git a/misc/skins/seasons-spring16M.ini b/misc/skins/seasons-spring16M.ini index b7848a7223..5fa4282811 100644 --- a/misc/skins/seasons-spring16M.ini +++ b/misc/skins/seasons-spring16M.ini @@ -100,7 +100,7 @@ dhotnormal = ;;underline dhotfocus = ;DialogFocus;underline dselnormal = ;DialogFocus - dselfocus = ;DialogFocus;underline + dselfocus = ;DialogFocus dtitle = ;;bold [error] diff --git a/misc/skins/seasons-summer16M.ini b/misc/skins/seasons-summer16M.ini index e33d99f6ba..41e2699907 100644 --- a/misc/skins/seasons-summer16M.ini +++ b/misc/skins/seasons-summer16M.ini @@ -100,7 +100,7 @@ dhotnormal = ;;underline dhotfocus = ;DialogFocus;underline dselnormal = ;DialogFocus - dselfocus = ;DialogFocus;underline + dselfocus = ;DialogFocus dtitle = ;;bold [error] diff --git a/misc/skins/seasons-winter16M.ini b/misc/skins/seasons-winter16M.ini index d41cb990bf..395a8671bd 100644 --- a/misc/skins/seasons-winter16M.ini +++ b/misc/skins/seasons-winter16M.ini @@ -100,7 +100,7 @@ dhotnormal = ;;underline dhotfocus = ;DialogFocus;underline dselnormal = ;DialogFocus - dselfocus = ;DialogFocus;underline + dselfocus = ;DialogFocus dtitle = ;;bold [error]