Use fill instead of outline for generic text buttons

plugdata-team · Oct 28, 2023 · a7bc078 · a7bc078
1 parent eaa326e
commit a7bc078
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 19 deletions.
diff --git a/Source/Dialogs/AboutPanel.h b/Source/Dialogs/AboutPanel.h
@@ -31,6 +31,20 @@ class AboutPanel : public Component {
         credits.setLineSpacing(1.1f);
         addAndMakeVisible(credits);
 
+        auto backgroundColour = findColour(PlugDataColour::dialogBackgroundColourId);
+        viewOnGithub.setColour(TextButton::buttonColourId, backgroundColour.contrasting(0.05f));
+        viewOnGithub.setColour(TextButton::buttonOnColourId, backgroundColour.contrasting(0.1f));
+        viewOnGithub.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
+
+        reportIssue.setColour(TextButton::buttonColourId, backgroundColour.contrasting(0.05f));
+        reportIssue.setColour(TextButton::buttonOnColourId, backgroundColour.contrasting(0.1f));
+        reportIssue.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
+
+        sponsor.setColour(TextButton::buttonColourId, backgroundColour.contrasting(0.05f));
+        sponsor.setColour(TextButton::buttonOnColourId, backgroundColour.contrasting(0.1f));
+        sponsor.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
+
+
         viewOnGithub.setButtonText("View on Github");
         reportIssue.setButtonText("Report issue");
         sponsor.setButtonText("Become a sponsor");

diff --git a/Source/Dialogs/Deken.h b/Source/Dialogs/Deken.h
@@ -815,13 +815,9 @@ class Deken : public Component
             addChildComponent(uninstallButton);
             addChildComponent(addToPathButton);
 
-            installButton.setColour(TextButton::buttonColourId, findColour(PlugDataColour::panelForegroundColourId));
-            uninstallButton.setColour(TextButton::buttonColourId, findColour(PlugDataColour::panelForegroundColourId));
-            addToPathButton.setColour(TextButton::buttonColourId, findColour(PlugDataColour::panelForegroundColourId));
-
-            installButton.setColour(TextButton::buttonOnColourId, findColour(PlugDataColour::panelActiveBackgroundColourId));
-            uninstallButton.setColour(TextButton::buttonOnColourId, findColour(PlugDataColour::panelActiveBackgroundColourId));
-            addToPathButton.setColour(TextButton::buttonOnColourId, findColour(PlugDataColour::panelActiveBackgroundColourId));
+            installButton.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
+            uninstallButton.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
+            addToPathButton.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
 
             installButton.setTooltip("Install package");
             uninstallButton.setTooltip("Uninstall package");

diff --git a/Source/Dialogs/Dialogs.cpp b/Source/Dialogs/Dialogs.cpp
@@ -150,14 +150,25 @@ void Dialogs::showOkayCancelDialog(std::unique_ptr<Dialog>* target, Component* p
         OkayCancelDialog(Dialog* dialog, String const& title, std::function<void(bool)> const& callback)
             : label("", title)
         {
-            setSize(400, 200);
+            setSize(375, 200);
+
+            label.setJustificationType(Justification::centred);
+            label.setFont(Fonts::getBoldFont().withHeight(14.0f));
+
             addAndMakeVisible(label);
             addAndMakeVisible(cancel);
             addAndMakeVisible(okay);
-
-            cancel.setColour(TextButton::buttonColourId, Colours::transparentBlack);
-            okay.setColour(TextButton::buttonColourId, Colours::transparentBlack);
-
+
+            auto backgroundColour = findColour(PlugDataColour::dialogBackgroundColourId);
+
+            cancel.setColour(TextButton::buttonColourId, backgroundColour.contrasting(0.05f));
+            cancel.setColour(TextButton::buttonOnColourId, backgroundColour.contrasting(0.1f));
+            cancel.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
+
+            okay.setColour(TextButton::buttonColourId, backgroundColour.contrasting(0.05f));
+            okay.setColour(TextButton::buttonOnColourId, backgroundColour.contrasting(0.1f));
+            okay.setColour(ComboBox::outlineColourId, Colours::transparentBlack);
+
             cancel.onClick = [dialog, callback] {
                 callback(false);
                 dialog->closeDialog();

diff --git a/Source/Dialogs/SaveDialog.h b/Source/Dialogs/SaveDialog.h
@@ -20,7 +20,10 @@ class SaveDialogButton : public TextButton {
         auto activeColour = findColour(PlugDataColour::toolbarActiveColourId);
 
         if (isMouseOver() || isMouseButtonDown()) {
-            backgroundColour = backgroundColour.contrasting(0.05f);
+            backgroundColour = backgroundColour.contrasting(0.1f);
+        }
+        else {
+            backgroundColour = backgroundColour.contrasting(0.06f);
         }
 
         g.setColour(backgroundColour);
@@ -31,10 +34,11 @@ class SaveDialogButton : public TextButton {
 
         g.drawText(getButtonText(), getLocalBounds().reduced(3), Justification::centred);
 
-        auto outlineColour = hasKeyboardFocus(false) ? activeColour : findColour(PlugDataColour::outlineColourId);
-
-        g.setColour(outlineColour);
-        PlugDataLook::drawSmoothedRectangle(g, PathStrokeType(1.0f), bounds, Corners::defaultCornerRadius);
+        if(hasKeyboardFocus(false))
+        {
+            g.setColour(activeColour);
+            PlugDataLook::drawSmoothedRectangle(g, PathStrokeType(1.0f), bounds, Corners::defaultCornerRadius);
+        }
     }
 };
 

diff --git a/Source/Heavy/DaisyExporter.h b/Source/Heavy/DaisyExporter.h
@@ -37,7 +37,7 @@ class DaisyExporter : public ExporterBase {
         exportButton.setVisible(false);
         addAndMakeVisible(flashButton);
 
-        flashButton.setColour(TextButton::buttonColourId, findColour(PlugDataColour::panelBackgroundColourId));
+        flashButton.setColour(ComboBox::outlineColourId, findColour(PlugDataColour::panelBackgroundColourId));
 
         exportTypeValue.addListener(this);
         targetBoardValue.addListener(this);

diff --git a/Source/Heavy/ExporterBase.h b/Source/Heavy/ExporterBase.h
@@ -47,7 +47,7 @@ struct ExporterBase : public Component
     {
         addAndMakeVisible(exportButton);
 
-        exportButton.setColour(TextButton::buttonColourId, findColour(PlugDataColour::panelBackgroundColourId));
+        exportButton.setColour(ComboBox::outlineColourId, findColour(PlugDataColour::panelBackgroundColourId));
 
         Array<PropertiesPanelProperty*> properties;
 

diff --git a/Source/LookAndFeel.cpp b/Source/LookAndFeel.cpp
@@ -281,6 +281,7 @@ void PlugDataLook::drawTextButtonBackground(Graphics& g, Button& button, bool sh
     auto cornerSize = Corners::defaultCornerRadius;
     g.setColour(backgroundColour);
     fillSmoothedRectangle(g, button.getLocalBounds().toFloat(), cornerSize);
+    jassertfalse; // I think we don't use this anymore?
 }
 
 void PlugDataLook::drawToolbarButtonBackground(Graphics& g, Button& button, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown)