UI redesign: first draft

Author: timothyschoen

Resources/Fonts/IconFont.ttf

@@ -83,60 +83,6 @@ void MainToolbarButton::mouseExit(MouseEvent const& e)
 }
 #endif
 
-void ToolbarRadioButton::paint(Graphics& g)
-{
-    bool const mouseOver = isOver();
-    bool const active = mouseOver || isDown() || getToggleState();
-
-    auto const flatOnLeft = isConnectedOnLeft();
-    auto const flatOnRight = isConnectedOnRight();
-    auto const flatOnTop = isConnectedOnTop();
-    auto const flatOnBottom = isConnectedOnBottom();
-
-    auto const backgroundColour = (active ? PlugDataColours::toolbarHoverColour : PlugDataColours::toolbarBackgroundColour).contrasting(mouseOver && !getToggleState() ? 0.0f : 0.035f);
-
-    auto bounds = getLocalBounds().toFloat();
-    bounds = bounds.reduced(0.0f, bounds.proportionOfHeight(0.17f));
-
-    g.setColour(backgroundColour);
-    Path p;
-    p.addRoundedRectangle(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight(), Corners::defaultCornerRadius, Corners::defaultCornerRadius,
-        !(flatOnLeft || flatOnTop),
-        !(flatOnRight || flatOnTop),
-        !(flatOnLeft || flatOnBottom),
-        !(flatOnRight || flatOnBottom));
-    g.fillPath(p);
-
-    auto const textColour = PlugDataColours::toolbarTextColour.withMultipliedAlpha(isEnabled() ? 1.0f : 0.5f);
-
-    g.setFont(Fonts::getIconFont().withHeight(getHeight() / 2.8));
-    g.setColour(textColour);
-    g.drawText(getButtonText(), getLocalBounds(), Justification::centred);
-}
-
-// On macOS, we need to make sure that dragging any of these buttons doesn't drag the whole titlebar
-#if JUCE_MAC
-void ToolbarRadioButton::mouseEnter(MouseEvent const& e)
-{
-    if (auto const* topLevel = getTopLevelComponent()) {
-        if (auto* peer = topLevel->getPeer()) {
-            OSUtils::setWindowMovable(peer, false);
-        }
-    }
-    TextButton::mouseEnter(e);
-}
-
-void ToolbarRadioButton::mouseExit(MouseEvent const& e)
-{
-    if (auto const* topLevel = getTopLevelComponent()) {
-        if (auto* peer = topLevel->getPeer()) {
-            OSUtils::setWindowMovable(peer, true);
-        }
-    }
-    TextButton::mouseExit(e);
-}
-#endif
-
 bool SmallIconButton::hitTest(int const x, int const y)
 {
     if (getLocalBounds().reduced(2).contains(x, y))

Source/Components/Buttons.cpp

@@ -28,20 +28,6 @@ class MainToolbarButton final : public TextButton {
 #endif
 };
 
-class ToolbarRadioButton final : public TextButton {
-
-public:
-    using TextButton::TextButton;
-
-    void paint(Graphics& g) override;
-
-    // On macOS, we need to make sure that dragging any of these buttons doesn't drag the whole titlebar
-#if JUCE_MAC
-    void mouseEnter(MouseEvent const& e) override;
-    void mouseExit(MouseEvent const& e) override;
-#endif
-};
-
 class SmallIconButton : public TextButton {
     using TextButton::TextButton;
 

Source/Components/Buttons.h

@@ -66,6 +66,7 @@ struct Icons {
     static inline String const DevTools = "{";
     static inline String const Help = "\\";
     static inline String const Checkmark = "_";
+    static inline String const Palette = CharPointer_UTF8 ("\xc3\x8b");
 
     static inline String const SavePatch = "Z";
     static inline String const ClosePatch = "[";
@@ -379,7 +380,6 @@ enum CommandIDs {
     ShowHelp,
     OpenObjectBrowser,
     ToggleDSP,
-    ShowCommandInput,
     NumItems // <-- the total number of items in this enum
 };
 

Source/Constants.h

@@ -122,84 +122,85 @@ class LimiterSettings final : public Component {
     TextButton four = TextButton("3db");
 };
 
-class AudioOutputSettings final : public Component {
-
+class AudioSettingsCallout final : public Component {
 public:
-    enum Type {
-        Limiter,
-        Oversampling
-    };
-
-    AudioOutputSettings(PluginProcessor* pd, AudioOutputSettings::Type const typeToShow, std::function<void()> const& changeCallback)
-        : limiterSettings(SettingsFile::getInstance()->getProperty<int>("limiter_threshold"))
+    explicit AudioSettingsCallout(PluginEditor* editor)
+        : pd(editor->pd)
+        , limiterSettings(SettingsFile::getInstance()->getProperty<int>("limiter_threshold"))
         , oversampleSettings(std::clamp(SettingsFile::getInstance()->getProperty<int>("oversampling"), 0, 3))
-        , type(typeToShow)
-        , onChange(changeCallback)
-    {
-        if (type == Limiter) {
-            addAndMakeVisible(limiterSettings);
-            limiterSettings.onChange = [this, pd](int const value) {
-                pd->setLimiterThreshold(value);
-                onChange();
-            };
-        } else {
-            addAndMakeVisible(oversampleSettings);
-            oversampleSettings.onChange = [this, pd](int const value) {
-                pd->setOversampling(value);
-                onChange();
-            };
-        }
-
-        setSize(170, 60);
-    }
-
-    ~AudioOutputSettings() override
     {
-        isShowing = false;
+        limiterLabel.setText("Limiter", dontSendNotification);
+        limiterLabel.setFont(Fonts::getSemiBoldFont().withHeight(13.5f));
+        addAndMakeVisible(limiterLabel);
+
+        limiterSettings.onChange = [this](int const value) {
+            pd->setLimiterThreshold(value);
+        };
+        addAndMakeVisible(limiterSettings);
+
+        oversamplingLabel.setText("Oversampling", dontSendNotification);
+        oversamplingLabel.setFont(Fonts::getSemiBoldFont().withHeight(13.5f));
+        addAndMakeVisible(oversamplingLabel);
+
+        oversampleSettings.onChange = [this, editor](int const value) {
+            pd->setOversampling(value);
+            editor->audioToolbar->updateOversampling();
+        };
+        addAndMakeVisible(oversampleSettings);
+
+        audioSettingsButton.setButtonText("Audio Settings...");
+        audioSettingsButton.onClick = [this, editor] {
+            Dialogs::showSettingsDialog(editor);
+            closeCalloutBox();
+        };
+
+        audioSettingsButton.setColour(TextButton::textColourOffId, PlugDataColours::popupMenuTextColour);
+        audioSettingsButton.setColour(TextButton::textColourOnId, PlugDataColours::popupMenuTextColour);
+        audioSettingsButton.setColour(TextButton::buttonColourId, PlugDataColours::popupMenuBackgroundColour.contrasting(0.04f));
+        audioSettingsButton.setColour(TextButton::buttonOnColourId, PlugDataColours::popupMenuBackgroundColour.contrasting(0.075f));
+        audioSettingsButton.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
+        addAndMakeVisible(audioSettingsButton);
+
+        setSize(200, 146);
     }
 
     void resized() override
     {
-        auto bounds = getLocalBounds().reduced(4.0f).withTrimmedTop(24);
+        auto b = getLocalBounds().reduced(10, 8);
+        constexpr int labelHeight = 18;
+        constexpr int selectorHeight = 28;
+        constexpr int gap = 6;
 
-        if (type == Limiter) {
-            limiterSettings.setBounds(bounds.removeFromTop(28));
-        } else {
-            oversampleSettings.setBounds(bounds.removeFromTop(28));
-        }
-    }
+        limiterLabel.setBounds(b.removeFromTop(labelHeight));
+        limiterSettings.setBounds(b.removeFromTop(selectorHeight));
+        b.removeFromTop(gap);
 
-    void paint(Graphics& g) override
-    {
-        if (type == Limiter) {
-            g.setColour(PlugDataColours::popupMenuTextColour);
-            g.setFont(Fonts::getBoldFont().withHeight(15));
-            g.drawText("Limiter Threshold", 0, 0, getWidth(), 24, Justification::centred);
-        } else {
-            g.setColour(PlugDataColours::popupMenuTextColour);
-            g.setFont(Fonts::getBoldFont().withHeight(15));
-            g.drawText("Oversampling", 0, 0, getWidth(), 24, Justification::centred);
-        }
+        oversamplingLabel.setBounds(b.removeFromTop(labelHeight));
+        oversampleSettings.setBounds(b.removeFromTop(selectorHeight));
+        b.removeFromTop(gap + 4);
 
-        g.setColour(PlugDataColours::toolbarOutlineColour);
-        g.drawLine(4, 24, getWidth() - 8, 24);
+        audioSettingsButton.setBounds(b.removeFromTop(selectorHeight - 4));
     }
 
-    static void show(PluginEditor* editor, Rectangle<int> const bounds, AudioOutputSettings::Type typeToShow, std::function<void()> changeCallback = [] { })
+    void closeCalloutBox()
     {
-        if (isShowing)
-            return;
-
-        isShowing = true;
-
-        auto audioOutputSettings = std::make_unique<AudioOutputSettings>(editor->pd, typeToShow, changeCallback);
-        editor->showCalloutBox(std::move(audioOutputSettings), bounds);
+        MessageManager::callAsync([_callout = SafePointer(findParentComponentOfClass<CallOutBox>())]() {
+            if (_callout)
+                _callout->dismiss();
+        });
     }
 
 private:
-    static inline bool isShowing = false;
+    PluginProcessor* pd;
+
+    Label limiterLabel;
     LimiterSettings limiterSettings;
+
+    Label oversamplingLabel;
     OversampleSettings oversampleSettings;
-    Type type;
-    std::function<void()> onChange;
+
+    TextButton audioSettingsButton;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(AudioSettingsCallout)
 };
+

Source/Dialogs/AudioOutputSettings.h

@@ -148,6 +148,11 @@ class GraphOnParent final : public ObjectBase {
         });
     }
 
+    bool showParametersWhenSelected() override
+    {
+        return false;
+    }
+
     void update() override
     {
         if (auto glist = ptr.get<t_canvas>()) {