Use OS DarkMode from sst; Use strnatcmp from sst (#5887)

sst_plugininfra provides an isDarkMode API (currently only returning correct values on macOS). This diff does the following 1. Move the menu colors to either follow OS or follow skin 2. Since that involves an upgrade to sstplugininfra, also fix the strnatcmp dependency, addressing #5868
surge-synthesizer · Feb 13, 2022 · 3e966c5 · 3e966c5
1 parent e0065b4
commit 3e966c5
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 273 deletions.
diff --git a/libs/sst/sst-plugininfra b/libs/sst/sst-plugininfra
diff --git a/libs/strnatcmp/CMakeLists.txt b/libs/strnatcmp/CMakeLists.txt
diff --git a/libs/strnatcmp/README.md b/libs/strnatcmp/README.md
diff --git a/libs/strnatcmp/strnatcmp.cpp b/libs/strnatcmp/strnatcmp.cpp
diff --git a/libs/strnatcmp/strnatcmp.h b/libs/strnatcmp/strnatcmp.h
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -4,7 +4,6 @@ project(surge-common)
 surge_add_lib_subdirectory(airwindows)
 surge_add_lib_subdirectory(eurorack)
 surge_add_lib_subdirectory(fmt)
-surge_add_lib_subdirectory(strnatcmp)
 surge_add_lib_subdirectory(oddsound-mts)
 if(MINGW)
   set(HAVE_VISIBILITY 0 CACHE INTERNAL "Force-disable libsamplerate's visibility check on MinGW")
@@ -323,10 +322,10 @@ target_link_libraries(${PROJECT_NAME}
   sst-plugininfra
   sst-plugininfra::filesystem
   sst-plugininfra::tinyxml
+  sst-plugininfra::strnatcmp
 
   surge::oddsound-mts
   surge::sqlite
-  surge::strnatcmp
   surge-common-binary
   tuning-library
   PRIVATE

diff --git a/src/common/ModulatorPresetManager.cpp b/src/common/ModulatorPresetManager.cpp
@@ -19,7 +19,7 @@
 #include "SurgeStorage.h"
 #include "tinyxml/tinyxml.h"
 #include "DebugHelpers.h"
-#include "strnatcmp.h"
+#include "sst/plugininfra/strnatcmp.h"
 
 namespace Surge
 {

diff --git a/src/common/SkinModelImpl.cpp b/src/common/SkinModelImpl.cpp
@@ -21,7 +21,7 @@
 #include <cstring>
 #include "resource.h"
 #include "SkinColors.h"
-#include "strnatcmp.h"
+#include "sst/plugininfra/strnatcmp.h"
 
 /*
  * This file implements the innards of the Connector class and the SkinColor class

diff --git a/src/common/SurgeStorage.cpp b/src/common/SurgeStorage.cpp
@@ -34,7 +34,7 @@
 #include "UserDefaults.h"
 #include "version.h"
 
-#include "strnatcmp.h"
+#include "sst/plugininfra/strnatcmp.h"
 #include "libMTSClient.h"
 #include "FxPresetAndClipboardManager.h"
 #include "ModulatorPresetManager.h"

diff --git a/src/surge-testrunner/UnitTestsINFRA.cpp b/src/surge-testrunner/UnitTestsINFRA.cpp
@@ -6,7 +6,7 @@
 #include "QuadFilterUnit.h"
 #include "MemoryPool.h"
 
-#include "strnatcmp.h"
+#include "sst/plugininfra/strnatcmp.h"
 
 #include "catch2/catch2.hpp"
 

diff --git a/src/surge-xt/gui/SurgeGUIEditor.cpp b/src/surge-xt/gui/SurgeGUIEditor.cpp
@@ -3657,11 +3657,9 @@ juce::PopupMenu SurgeGUIEditor::makeSkinMenu(const juce::Point<int> &where)
         Surge::Storage::updateUserDefaultValue(&(synth->storage), Surge::Storage::MenuLightness, i);
         juceEditor->surgeLF->onSkinChanged();
     };
-    skinSubMenu.addItem(Surge::GUI::toOSCaseForMenu("Always Dark Menus"), true, menuMode == 0,
-                        [resetMenuTo]() { resetMenuTo(0); });
-    skinSubMenu.addItem(Surge::GUI::toOSCaseForMenu("Always Light Menus"), true, menuMode == 1,
-                        [resetMenuTo]() { resetMenuTo(1); });
-    skinSubMenu.addItem(Surge::GUI::toOSCaseForMenu("Menus From Skin"), true, menuMode == 2,
+    skinSubMenu.addItem(Surge::GUI::toOSCaseForMenu("Menu Follows OS Light/Dark Mode"), true,
+                        menuMode == 1, [resetMenuTo]() { resetMenuTo(1); });
+    skinSubMenu.addItem(Surge::GUI::toOSCaseForMenu("Menus Follows Skin"), true, menuMode == 2,
                         [resetMenuTo]() { resetMenuTo(2); });
     skinSubMenu.addSeparator();
 

diff --git a/src/surge-xt/gui/SurgeJUCELookAndFeel.cpp b/src/surge-xt/gui/SurgeJUCELookAndFeel.cpp
@@ -22,6 +22,7 @@
 
 #include <juce_audio_utils/juce_audio_utils.h>
 #include "UserDefaults.h"
+#include "sst/plugininfra/misc_platform.h"
 
 // here and only here we using namespace juce so I can copy and override stuff from v4 easily
 using namespace juce;
@@ -50,21 +51,24 @@ void SurgeJUCELookAndFeel::onSkinChanged()
         menuMode = Surge::Storage::getUserDefaultValue(storage, Surge::Storage::MenuLightness, 2);
     if (menuMode == 1)
     {
-        setColour(PopupMenu::backgroundColourId, Colour(255, 255, 255));
-        setColour(PopupMenu::highlightedBackgroundColourId, Colour(220, 220, 230));
-        setColour(PopupMenu::textColourId, juce::Colours::black);
-        setColour(PopupMenu::headerTextColourId, juce::Colours::black);
-        setColour(PopupMenu::highlightedTextColourId, juce::Colour(0, 0, 40));
-    }
-    else if (menuMode == 0) // FIXME = mode 2 is follow skin
-    {
-        setColour(PopupMenu::backgroundColourId, Colour(48, 48, 48));
-        setColour(PopupMenu::highlightedBackgroundColourId, Colour(96, 96, 96));
-        setColour(PopupMenu::textColourId, juce::Colours::white);
-        setColour(PopupMenu::headerTextColourId, juce::Colours::white);
-        setColour(PopupMenu::highlightedTextColourId, juce::Colour(240, 240, 250));
+        if (sst::plugininfra::misc_platform::isDarkMode())
+        {
+            setColour(PopupMenu::backgroundColourId, Colour(48, 48, 48));
+            setColour(PopupMenu::highlightedBackgroundColourId, Colour(96, 96, 96));
+            setColour(PopupMenu::textColourId, juce::Colours::white);
+            setColour(PopupMenu::headerTextColourId, juce::Colours::white);
+            setColour(PopupMenu::highlightedTextColourId, juce::Colour(240, 240, 250));
+        }
+        else
+        {
+            setColour(PopupMenu::backgroundColourId, Colour(255, 255, 255));
+            setColour(PopupMenu::highlightedBackgroundColourId, Colour(220, 220, 230));
+            setColour(PopupMenu::textColourId, juce::Colours::black);
+            setColour(PopupMenu::headerTextColourId, juce::Colours::black);
+            setColour(PopupMenu::highlightedTextColourId, juce::Colour(0, 0, 40));
+        }
     }
-    else if (menuMode == 2)
+    else
     {
         setColour(PopupMenu::backgroundColourId, skin->getColor(Colors::PopupMenu::Background));
         setColour(PopupMenu::highlightedBackgroundColourId,
+23 −21		CMakeLists.txt
+3 −2		README.md
+2 −1		include/sst/plugininfra.h
+19 −0		include/sst/plugininfra/misc_platform.h
+327 −0		include/sst/plugininfra/userdefaults.h
+8 −0		libs/strnatcmp/CMakeLists.txt
+24 −0		libs/strnatcmp/README.md
+31 −0		libs/strnatcmp/ls
+31 −0		libs/strnatcmp/sst/plugininfra/strnatcmp.h
+185 −0		libs/strnatcmp/strnatcmp.cpp
+16 −0		src/misc_linux.cpp
+23 −0		src/misc_macos.mm
+38 −0		src/misc_windows.cpp
+1 −1		tests/CMakeLists.txt
+154 −0		tests/tests.cpp