Update alert window layout and icon colors

Author: anjaldoshi

Source/UI/ControlPanel.cpp

@@ -587,7 +587,7 @@ void ControlPanel::startAcquisition (bool recordingShouldAlsoStart)
         playButton->setToggleState (false, dontSendNotification);
         recordButton->setToggleState (false, dontSendNotification);
 
-        String errorMsg = "No output device found. Unable to start acquisition!";
+        String errorMsg = "No output device found. Unable to start acquisition.";
         LOGE (errorMsg);
 
         if (! isConsoleApp)
@@ -597,7 +597,7 @@ void ControlPanel::startAcquisition (bool recordingShouldAlsoStart)
                         "and ensure there is an output device selected.";
 
             AlertWindow::showMessageBox (AlertWindow::WarningIcon,
-                                         "Acquisition Error!",
+                                         "Acquisition Error",
                                          errorMsg);
         }
 
@@ -609,7 +609,7 @@ void ControlPanel::startAcquisition (bool recordingShouldAlsoStart)
         playButton->setToggleState (false, dontSendNotification);
         recordButton->setToggleState (false, dontSendNotification);
 
-        String errorMsg = "Sample rate too low. Unable to start acquisition!";
+        String errorMsg = "Sample rate too low. Unable to start acquisition.";
         LOGE (errorMsg);
 
         if (! isConsoleApp)
@@ -619,7 +619,7 @@ void ControlPanel::startAcquisition (bool recordingShouldAlsoStart)
                         "to a value of 44.1 kHz or higher. If no such option is available, try changing the output device type.";
 
             AlertWindow::showMessageBox (AlertWindow::WarningIcon,
-                                         "Acquisition Error!",
+                                         "Acquisition Error",
                                          errorMsg);
         }
 

Source/UI/LookAndFeel/CustomLookAndFeel.cpp

@@ -727,7 +727,7 @@ void CustomLookAndFeel::drawMenuBarBackground (Graphics& g, int width, int heigh
 
     if (menuBar.getName().equalsIgnoreCase ("MainMenu"))
     {
-        g.setColour (findColour (ThemeColours::defaultText));
+        g.setColour (findColour (ThemeColours::defaultText).withAlpha (menuBar.isEnabled() ? 1.0f : 0.5f));
         String ver = "v" + String (ProjectInfo::versionString);
         g.setFont (getCommonMenuFont());
         int verStrWidth = GlyphArrangement::getStringWidthInt (getCommonMenuFont(), ver);
@@ -960,7 +960,7 @@ class CustomDocumentWindowButton : public Button
 
     void paintButton (Graphics& g, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override
     {
-        auto pathColour = findColour (ThemeColours::controlPanelText);
+        auto pathColour = findColour (ThemeColours::controlPanelText).withAlpha (isEnabled() ? 1.0f : 0.5f);
 
         // g.fillAll (background);
 
@@ -1117,6 +1117,110 @@ void CustomLookAndFeel::drawDocumentWindowTitleBar (DocumentWindow& window, Grap
     g.drawText (window.getName(), textX, 0, textW, h, Justification::centredLeft, true);
 }
 
+//==================================================================
+// ALERT WINDOW METHODS :
+//==================================================================
+
+AlertWindow* CustomLookAndFeel::createAlertWindow (const String& title,
+                                                   const String& message,
+                                                   const String& button1,
+                                                   const String& button2,
+                                                   const String& button3,
+                                                   MessageBoxIconType iconType,
+                                                   int numButtons,
+                                                   Component* associatedComponent)
+{
+    auto boundsOffset = 20;
+
+    auto* aw = LookAndFeel_V2::createAlertWindow (title, message, button1, button2, button3, iconType, numButtons, associatedComponent);
+
+    auto bounds = aw->getBounds();
+    bounds = bounds.withSizeKeepingCentre (bounds.getWidth() + boundsOffset, bounds.getHeight() + boundsOffset);
+    aw->setBounds (bounds);
+
+    for (auto* child : aw->getChildren())
+        if (auto* button = dynamic_cast<TextButton*> (child))
+            button->setBounds (button->getBounds() + Point<int> (10, 10));
+
+    return aw;
+}
+
+void CustomLookAndFeel::drawAlertBox (Graphics& g, AlertWindow& alert, const Rectangle<int>& textArea, TextLayout& textLayout)
+{
+    auto cornerSize = 0.0f;
+
+    g.setColour (alert.findColour (AlertWindow::outlineColourId));
+    g.drawRoundedRectangle (alert.getLocalBounds().toFloat(), cornerSize, 2.0f);
+
+    auto bounds = alert.getLocalBounds().reduced (1);
+    g.reduceClipRegion (bounds);
+
+    g.setColour (alert.findColour (AlertWindow::backgroundColourId));
+    g.fillRoundedRectangle (bounds.toFloat(), cornerSize);
+
+    auto iconSpaceUsed = 0;
+
+    auto iconWidth = 50;
+    auto iconSize = jmin (iconWidth, bounds.getHeight());
+
+    if (alert.containsAnyExtraComponents() || alert.getNumButtons() > 2)
+        iconSize = jmin (iconSize, textArea.getHeight() + 50);
+
+    juce::Rectangle<int> iconRect (10, 30, iconSize, iconSize);
+
+    if (alert.getAlertType() != MessageBoxIconType::NoIcon)
+    {
+        Path icon;
+        char character;
+        Colour colour;
+
+        if (alert.getAlertType() == MessageBoxIconType::WarningIcon)
+        {
+            character = '!';
+
+            icon.addTriangle ((float) iconRect.getX() + (float) iconRect.getWidth() * 0.5f,
+                              (float) iconRect.getY(),
+                              static_cast<float> (iconRect.getRight()),
+                              static_cast<float> (iconRect.getBottom()),
+                              static_cast<float> (iconRect.getX()),
+                              static_cast<float> (iconRect.getBottom()));
+
+            icon = icon.createPathWithRoundedCorners (5.0f);
+            colour = findColour (ProcessorColour::SOURCE_COLOUR);
+        }
+        else
+        {
+            colour = findColour (ProcessorColour::FILTER_COLOUR);
+            character = alert.getAlertType() == MessageBoxIconType::InfoIcon ? 'i' : '?';
+
+            icon.addEllipse (iconRect.toFloat());
+        }
+
+        GlyphArrangement ga;
+        ga.addFittedText (withDefaultMetrics (FontOptions { (float) iconRect.getHeight() * 0.9f, Font::bold }),
+                          String::charToString ((juce_wchar) (uint8) character),
+                          static_cast<float> (iconRect.getX()),
+                          static_cast<float> (iconRect.getY()),
+                          static_cast<float> (iconRect.getWidth()),
+                          static_cast<float> (iconRect.getHeight()),
+                          Justification::centred,
+                          1);
+
+        g.setColour (Colour (colour));
+        g.fillPath (icon);
+
+        g.setColour (Colours::white);
+        ga.draw (g);
+
+        iconSpaceUsed = iconWidth + 20;
+    }
+
+    juce::Rectangle<int> alertBounds (bounds.getX() + iconSpaceUsed, 30, bounds.getWidth() - iconSpaceUsed, bounds.getHeight() - getAlertWindowButtonHeight() - 50);
+
+    g.setColour (alert.findColour (AlertWindow::textColourId));
+    textLayout.draw (g, alertBounds.toFloat());
+}
+
 int CustomLookAndFeel::getAlertWindowButtonHeight() { return 30; }
 Font CustomLookAndFeel::getAlertWindowTitleFont() { return FontOptions { "Inter", "Bold", 20.f }; }
 Font CustomLookAndFeel::getAlertWindowMessageFont() { return FontOptions { "Inter", "Medium", 18.f }; }

Source/UI/LookAndFeel/CustomLookAndFeel.h

@@ -183,13 +183,14 @@ class TESTABLE CustomLookAndFeel : public LookAndFeel_V4
     void drawDocumentWindowTitleBar (DocumentWindow&, Graphics&, int, int, int, int, const Image*, bool) override;
 
     // ========= custom Alert Window methods: ===========================
+    AlertWindow* createAlertWindow (const String& title, const String& message, const String& button1, const String& button2, const String& button3, MessageBoxIconType iconType, int numButtons, Component* associatedComponent) override;
+    void drawAlertBox (Graphics&, AlertWindow&, const juce::Rectangle<int>& textArea, TextLayout&) override;
     int getAlertWindowButtonHeight() override;
     Font getAlertWindowTitleFont() override;
     Font getAlertWindowMessageFont() override;
     Font getAlertWindowFont() override;
 
     // ======== custom TabButton methods: ================================
-
     int getTabButtonSpaceAroundImage() override;
     int getTabButtonOverlap (int tabDepth) override;
     int getTabButtonBestWidth (TabBarButton&, int tabDepth) override;