mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-03 23:39:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a deadlock in ColorThemeOverlay and fixed default background color in Colors.

Browse Source
This commit is contained in:
casey langen 2017-03-14 16:46:51 -07:00
parent 62f782469e
commit 14add8d4cd
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/musikbox/app/overlay/ColorThemeOverlay.cpp
View File

@ -178,11 +178,7 @@ void ColorThemeOverlay::Show256ColorsInfo(bool enabled, std::function<void()> ca
if (enabled) { if (enabled) {
prefs->SetBool(box::prefs::keys::UsePaletteColors, enabled); prefs->SetBool(box::prefs::keys::UsePaletteColors, enabled);
prefs->Save(); prefs->Save();
showNeedsRestart(); showNeedsRestart(callback);
if (callback) {
callback();
}
} }
else { else {
std::shared_ptr<DialogOverlay> dialog(new DialogOverlay()); std::shared_ptr<DialogOverlay> dialog(new DialogOverlay());

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

@ -183,7 +183,7 @@ struct Theme {
void Reset() { void Reset() {
/* main */ /* main */
background.Set(THEME_COLOR_BACKGROUND, 24, 24, 20, COLOR_BLACK); background.Set(THEME_COLOR_BACKGROUND, 24, 24, 20, -1);
foreground.Set(THEME_COLOR_FOREGROUND, 220, 220, 220, COLOR_256_OFFWHITE); foreground.Set(THEME_COLOR_FOREGROUND, 220, 220, 220, COLOR_256_OFFWHITE);
focusedBorder.Set(THEME_COLOR_FOCUSED_BORDER, 220, 82, 86, COLOR_256_RED); focusedBorder.Set(THEME_COLOR_FOCUSED_BORDER, 220, 82, 86, COLOR_256_RED);
@ -218,7 +218,7 @@ struct Theme {
bannerForeground.Set(THEME_COLOR_BANNER_FOREGROUND, 24, 24, 20, COLOR_BLACK); bannerForeground.Set(THEME_COLOR_BANNER_FOREGROUND, 24, 24, 20, COLOR_BLACK);
/* listview */ /* listview */
listHeaderBackground.Set(THEME_COLOR_LIST_HEADER_BACKGROUND, 36, 36, 31, COLOR_BLACK); listHeaderBackground.Set(THEME_COLOR_LIST_HEADER_BACKGROUND, 36, 36, 31, -1);
listHeaderForeground.Set(THEME_COLOR_LIST_HEADER_FOREGROUND, 166, 226, 46, COLOR_256_GREEN); listHeaderForeground.Set(THEME_COLOR_LIST_HEADER_FOREGROUND, 166, 226, 46, COLOR_256_GREEN);
listHighlightedBackground.Set(THEME_COLOR_LIST_ITEM_HIGHLIGHTED_BACKGROUND, 166, 226, 46, COLOR_256_GREEN); listHighlightedBackground.Set(THEME_COLOR_LIST_ITEM_HIGHLIGHTED_BACKGROUND, 166, 226, 46, COLOR_256_GREEN);
listHighlightedForeground.Set(THEME_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND, 24, 24, 20, COLOR_BLACK); listHighlightedForeground.Set(THEME_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND, 24, 24, 20, COLOR_BLACK);