Cleanup, fix initial light mode

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-05-20 19:48:52 +02:00
parent 1262f318da
commit aa90be8d60
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
6 changed files with 5 additions and 15 deletions

3
deps/Makefile vendored
View file

@ -274,9 +274,6 @@ SURGE_CXX_FLAGS += -msse -msse2 -mfpmath=sse
endif endif
endif endif
# same flags as applied to main build
SURGE_CXX_FLAGS += -I$(abspath ../src/Rack/dep/simde)
# possibly use fftw? # possibly use fftw?
# ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true) # ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true)
# SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1 # SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1

View file

@ -643,7 +643,7 @@ CATROMODULO_CUSTOM = LowFrequencyOscillator NumDisplayWidget
PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp)) PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp))
# modules/types which are present in other plugins # modules/types which are present in other plugins
CF_CUSTOM = $(DRWAV) ledTrigger CF_CUSTOM = $(DRWAV)
# -------------------------------------------------------------- # --------------------------------------------------------------
# dBiz # dBiz

View file

@ -108,10 +108,6 @@ void Window::step() {
} }
// void Window::activateContext() {
// }
void Window::screenshot(const std::string&) { void Window::screenshot(const std::string&) {
} }

View file

@ -61,6 +61,9 @@ void updateForcingBlackSilverScrewMode(std::string slug) {
} }
} }
#endif #endif
namespace plugin {
void updateStaticPluginsDarkMode();
}
namespace settings { namespace settings {
bool darkMode = true; bool darkMode = true;
int rateLimit = 0; int rateLimit = 0;
@ -1483,6 +1486,7 @@ void switchDarkMode(const bool darkMode)
settings::darkMode = darkMode; settings::darkMode = darkMode;
settings::uiTheme = darkMode ? "dark" : "light"; settings::uiTheme = darkMode ? "dark" : "light";
ui::refreshTheme(); ui::refreshTheme();
plugin::updateStaticPluginsDarkMode();
for (ExtendedNSVGimage& ext : loadedDarkSVGs) for (ExtendedNSVGimage& ext : loadedDarkSVGs)
{ {

View file

@ -67,9 +67,6 @@ std::string patchesPath();
namespace engine { namespace engine {
void Engine_setRemoteDetails(Engine*, remoteUtils::RemoteDetails*); void Engine_setRemoteDetails(Engine*, remoteUtils::RemoteDetails*);
} }
namespace plugin {
void updateStaticPluginsDarkMode();
}
namespace app { namespace app {
namespace menuBar { namespace menuBar {
@ -565,7 +562,6 @@ struct ViewButton : MenuButton {
darkModeText = CHECKMARK_STRING; darkModeText = CHECKMARK_STRING;
menu->addChild(createMenuItem("Dark Mode", darkModeText, []() { menu->addChild(createMenuItem("Dark Mode", darkModeText, []() {
switchDarkMode(!settings::darkMode); switchDarkMode(!settings::darkMode);
plugin::updateStaticPluginsDarkMode();
setAllFramebufferWidgetsDirty(APP->scene); setAllFramebufferWidgetsDirty(APP->scene);
})); }));

View file

@ -66,13 +66,10 @@ const std::string APP_VERSION_MAJOR = "2";
const std::string APP_VERSION = "2.3.0"; const std::string APP_VERSION = "2.3.0";
#if defined ARCH_WIN #if defined ARCH_WIN
const std::string APP_OS = "win"; const std::string APP_OS = "win";
const std::string APP_OS_NAME = "Windows";
#elif defined ARCH_MAC #elif defined ARCH_MAC
const std::string APP_OS = "mac"; const std::string APP_OS = "mac";
const std::string APP_OS_NAME = "macOS";
#elif defined ARCH_LIN #elif defined ARCH_LIN
const std::string APP_OS = "lin"; const std::string APP_OS = "lin";
const std::string APP_OS_NAME = "Linux";
#else #else
#error ARCH_LIN undefined #error ARCH_LIN undefined
#endif #endif