mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-04-01 10:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added missing active+highlighted list item state.

Browse Source
This commit is contained in:
Casey Langen 2017-03-13 08:50:14 -07:00
parent 3564064e71
commit 04c1e52e85
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/musikbox/cursespp/Colors.cpp
View File

@ -70,6 +70,8 @@ indicies we'll use to store them */
#define THEME_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND 42 #define THEME_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND 42
#define THEME_COLOR_LIST_ITEM_ACTIVE_BACKGROUND 43 #define THEME_COLOR_LIST_ITEM_ACTIVE_BACKGROUND 43
#define THEME_COLOR_LIST_ITEM_ACTIVE_FOREGROUND 44 #define THEME_COLOR_LIST_ITEM_ACTIVE_FOREGROUND 44
#define THEME_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_BACKGROUND 45
#define THEME_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_FOREGROUND 46
/* user-readable names for the color identifiers above. these are /* user-readable names for the color identifiers above. these are
used as key names in the config files */ used as key names in the config files */
@ -102,6 +104,8 @@ used as key names in the config files */
#define JSON_KEY_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND "list_item_highlighted_foreground" #define JSON_KEY_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND "list_item_highlighted_foreground"
#define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_BACKGROUND "list_item_active_background" #define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_BACKGROUND "list_item_active_background"
#define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_FOREGROUND "list_item_active_foreground" #define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_FOREGROUND "list_item_active_foreground"
#define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_BACKGROUND "list_item_active_highlighted_background"
#define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_FOREGROUND "list_item_active_highlighted_foreground"
#define JSON_KEY_NAME "name" #define JSON_KEY_NAME "name"
#define JSON_KEY_SCHEMA_VERSION "schemaVersion" #define JSON_KEY_SCHEMA_VERSION "schemaVersion"
@ -219,6 +223,8 @@ struct Theme {
listHighlightedForeground.Set(THEME_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND, 0, 0, 0, COLOR_BLACK); listHighlightedForeground.Set(THEME_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND, 0, 0, 0, COLOR_BLACK);
listActiveBackground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_BACKGROUND, 66, 66, 56, COLOR_256_MEDIUM_GRAY); listActiveBackground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_BACKGROUND, 66, 66, 56, COLOR_256_MEDIUM_GRAY);
listActiveForeground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_FOREGROUND, 230, 220, 116, COLOR_256_YELLOW); listActiveForeground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_FOREGROUND, 230, 220, 116, COLOR_256_YELLOW);
listActiveHighlightedBackground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_BACKGROUND, 230, 220, 116, COLOR_256_YELLOW);
listActiveHighlightedForeground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_FOREGROUND, 0, 0, 0, COLOR_BLACK);
} }
bool LoadFromFile(const std::string& fn) { bool LoadFromFile(const std::string& fn) {
@ -294,6 +300,8 @@ struct Theme {
this->listHighlightedForeground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND, unset)); this->listHighlightedForeground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND, unset));
this->listActiveBackground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_BACKGROUND, unset)); this->listActiveBackground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_BACKGROUND, unset));
this->listActiveForeground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_FOREGROUND, unset)); this->listActiveForeground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_FOREGROUND, unset));
this->listActiveHighlightedBackground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_BACKGROUND, unset));
this->listActiveHighlightedForeground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_FOREGROUND, unset));
} }
} }
catch (...) { catch (...) {
@ -377,10 +385,10 @@ struct Theme {
listHighlightedForeground.Id(mode, COLOR_BLACK), listHighlightedForeground.Id(mode, COLOR_BLACK),
listHighlightedBackground.Id(mode, COLOR_GREEN)); listHighlightedBackground.Id(mode, COLOR_GREEN));
init_pair( /* note: swap active fg/bg */ init_pair(
CURSESPP_HIGHLIGHTED_SELECTED_LIST_ITEM, CURSESPP_HIGHLIGHTED_SELECTED_LIST_ITEM,
listActiveBackground.Id(mode, COLOR_BLACK), listActiveHighlightedForeground.Id(mode, COLOR_BLACK),
listActiveForeground.Id(mode, COLOR_YELLOW)); listActiveHighlightedBackground.Id(mode, COLOR_YELLOW));
} }
/* main */ /* main */
@ -425,6 +433,8 @@ struct Theme {
Color listHighlightedForeground; Color listHighlightedForeground;
Color listActiveForeground; Color listActiveForeground;
Color listActiveBackground; Color listActiveBackground;
Color listActiveHighlightedBackground;
Color listActiveHighlightedForeground;
}; };
/* some terminals report custom colors are supported, and also /* some terminals report custom colors are supported, and also

18
src/musikbox/data/themes/solarized_dark.json
View File

@ -103,20 +103,28 @@
"palette": 64 "palette": 64
}, },
"list_item_highlighted_background": { "list_item_highlighted_background": {
"hex": "#859900", "hex": "#93a1a1",
"palette": 64 "palette": 245
}, },
"list_item_highlighted_foreground": { "list_item_highlighted_foreground": {
"hex": "#002b36", "hex": "#002b36",
"palette": 234 "palette": 234
}, },
"list_item_active_background": { "list_item_active_background": {
"hex": "#eee8d5",
"palette": 254
},
"list_item_active_foreground": {
"hex": "#073642", "hex": "#073642",
"palette": 235 "palette": 235
}, },
"list_item_active_foreground": { "list_item_active_highlighted_background": {
"hex": "#268bd2", "hex": "#fdf6e3",
"palette": 33 "palette": 230
},
"list_item_active_highlighted_foreground": {
"hex": "#073642",
"palette": 235
} }
} }
} }