Merge branch development-juce8 into testing-juce8

open-ephys · Mar 4, 2025 · f2afd1c · f2afd1c
2 parents 0c953aa + 204dda7
commit f2afd1c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/Source/Processors/Editors/GenericEditor.cpp b/Source/Processors/Editors/GenericEditor.cpp
@@ -871,25 +871,24 @@ void UtilityButton::paintButton (Graphics& g, bool isMouseOver, bool isButtonDow
 {
     isEnabled = Button::isEnabled();
 
+    Colour backgroundColour = findColour (ThemeColours::widgetBackground);
+
     if (getToggleState())
     {
-        g.setColour (findColour (ThemeColours::highlightedFill));
-    }
-    else
-    {
-        g.setColour (findColour (ThemeColours::widgetBackground));
+        backgroundColour = findColour (ThemeColours::highlightedFill);
     }
 
-    g.fillPath (outlinePath);
+    auto baseColour = backgroundColour.withMultipliedSaturation (hasKeyboardFocus (true) ? 1.3f : 1.0f)
+                          .withMultipliedAlpha (isEnabled ? 1.0f : 0.5f);
 
-    if (isMouseOver || ! isEnabled)
-        g.setColour (findColour (ThemeColours::outline).withAlpha (0.4f));
-    else
-        g.setColour (findColour (ThemeColours::outline));
+    if (isButtonDown || isMouseOver)
+        baseColour = baseColour.contrasting (isButtonDown ? 0.2f : 0.05f);
 
-    g.strokePath (outlinePath, PathStrokeType (1.0f));
+    g.setColour (baseColour);
+    g.fillPath (outlinePath);
 
-    //int stringWidth = font.getStringWidth(getName());
+    g.setColour (findColour (ThemeColours::outline).withAlpha (isEnabled ? 1.0f : 0.5f));
+    g.strokePath (outlinePath, PathStrokeType (1.0f));
 
     g.setFont (font);
 

diff --git a/Source/Processors/PluginManager/PluginManager.cpp b/Source/Processors/PluginManager/PluginManager.cpp
@@ -270,7 +270,7 @@ int PluginManager::loadPlugin (const String& pluginLoc)
 	to memory mishaps.
 	*/
     void* handle = 0;
-    handle = dlopen (processorLocCString, RTLD_GLOBAL | RTLD_NOW);
+    handle = dlopen (processorLocCString, RTLD_LOCAL | RTLD_NOW);
 #endif
 
     if (! handle)

diff --git a/Source/UI/PluginInstaller.cpp b/Source/UI/PluginInstaller.cpp
@@ -84,6 +84,10 @@ PluginInstaller::PluginInstaller (bool loadComponents)
     if (loadComponents)
     {
         setSize (910, 480);
+
+        if (auto window = getActiveTopLevelWindow())
+            setCentrePosition (window->getScreenBounds().getCentre());
+
 #ifdef JUCE_WINDOWS
         setUsingNativeTitleBar (false);
 #else

diff --git a/Source/UI/UIComponent.cpp b/Source/UI/UIComponent.cpp
@@ -1123,7 +1123,6 @@ bool UIComponent::perform (const InvocationInfo& info)
             }
             pluginInstaller->setVisible (true);
             pluginInstaller->toFront (true);
-            pluginInstaller->setCentrePosition (this->getScreenBounds().getCentre());
             break;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1123,7 +1123,6 @@ bool UIComponent::perform (const InvocationInfo& info) @@
                 }
                 pluginInstaller->setVisible (true);
                 pluginInstaller->toFront (true);
-                pluginInstaller->setCentrePosition (this->getScreenBounds().getCentre());
                 break;
             }
@@ Expand Down @@