More tweaks for 2.4 update

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-12-17 16:36:54 +01:00
parent 1895052e17
commit 241df7f5c7
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
11 changed files with 65 additions and 36 deletions

@ -1 +1 @@
Subproject commit 5f05d62ddc2773098daf1044eb6698581acd4eb6
Subproject commit 7e20713eacc51179cd7faf0f4428def2b82273a9

View file

@ -17,12 +17,12 @@ void writeThemeAndContrastAsDefault() {}
void saveThemeAndContrastAsDefault(int, float) {}
void loadThemeAndContrastFromDefault(int* panelTheme, float* panelContrast) {
*panelTheme = rack::settings::darkMode ? 1 : 0;
*panelTheme = rack::settings::preferDarkPanels ? 1 : 0;
*panelContrast = panelContrastDefault;
}
bool isDark(int*) {
return rack::settings::darkMode;
return rack::settings::preferDarkPanels;
}
void readThemeAndContrastFromDefault() {}
@ -47,7 +47,7 @@ void PanelBaseWidget::draw(const DrawArgs& args) {
void InverterWidget::draw(const DrawArgs& args) {
TransparentWidget::draw(args);
if (rack::settings::darkMode) {
if (rack::settings::preferDarkPanels) {
// nvgSave(args.vg);
nvgBeginPath(args.vg);
nvgFillColor(args.vg, SCHEME_WHITE);// this is the source, the current framebuffer is the dest

@ -1 +1 @@
Subproject commit 6ac79f59c5b95433d82bcc759c4cd0642ec35098
Subproject commit 2d06199dd36ecdfe33d640ed1602f1041930f013

View file

@ -353,7 +353,7 @@ static void initStatic__BogaudioModules()
{
// Make sure to use match Cardinal theme
Skins& skins(Skins::skins());
skins._default = settings::darkMode ? "dark" : "light";
skins._default = settings::preferDarkPanels ? "dark" : "light";
p->addModel(modelAD);
p->addModel(modelBogaudioLFO);
@ -649,7 +649,7 @@ void destroyStaticPlugins()
void updateStaticPluginsDarkMode()
{
const bool darkMode = settings::darkMode;
const bool darkMode = settings::preferDarkPanels;
// bogaudio
{
Skins& skins(Skins::skins());

View file

@ -1,6 +1,6 @@
/*
* DISTRHO Cardinal Plugin
* Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@ -23,15 +23,15 @@ using namespace sst::surgext_rack::style;
void surgext_rack_initialize()
{
BaconStyle::get()->activeStyle = rack::settings::darkMode ? BaconStyle::DARK : BaconStyle::LIGHT;
BaconStyle::get()->activeStyle = rack::settings::preferDarkPanels ? BaconStyle::DARK : BaconStyle::LIGHT;
XTStyle::initialize();
}
void surgext_rack_update_theme()
{
BaconStyle::get()->activeStyle = rack::settings::darkMode ? BaconStyle::DARK : BaconStyle::LIGHT;
BaconStyle::get()->activeStyle = rack::settings::preferDarkPanels ? BaconStyle::DARK : BaconStyle::LIGHT;
BaconStyle::get()->notifyStyleListeners();
XTStyle::setGlobalStyle(rack::settings::darkMode ? XTStyle::Style::DARK : XTStyle::Style::LIGHT);
XTStyle::setGlobalStyle(rack::settings::preferDarkPanels ? XTStyle::Style::DARK : XTStyle::Style::LIGHT);
XTStyle::notifyStyleListeners();
}