Optimise statusbar, basic implementation for console notifications

Author: timothyschoen

Source/Components/TouchSelectionHelper.h

@@ -251,11 +251,6 @@ class TouchSelectionHelper final : public Component
         }
     }
 
-    void render(NVGcontext* nvg) override
-    {
-        componentImage.renderJUCEComponent(nvg, *this, 2.0f);
-    }
-
 private:
     void paint(Graphics& g) override
     {
@@ -270,6 +265,5 @@ class TouchSelectionHelper final : public Component
     }
 
     PluginEditor* editor;
-    NVGImage componentImage;
     OwnedArray<MainToolbarButton> actionButtons;
 };

Source/Pd/Instance.cpp

@@ -130,18 +130,23 @@ class ConsoleMessageHandler final : public Timer {
         auto item = std::tuple<void*, SmallString, bool>();
         int numReceived = 0;
         bool newWarning = false;
+        SmallString lastMessage;
+        bool lastIsWarning = false;
 
         while (pendingMessages.try_dequeue(item)) {
             auto& [object, message, type] = item;
             addMessage(object, message.toString(), type);
 
             numReceived++;
             newWarning = newWarning || type;
+            lastMessage = message;
+            lastIsWarning = type;
+
         }
 
         // Check if any item got assigned
         if (numReceived) {
-            instance->updateConsole(numReceived, newWarning);
+            instance->updateConsole(lastMessage, lastIsWarning, numReceived, newWarning);
         }
     }
 

Source/Pd/Instance.h

@@ -221,7 +221,7 @@ class Instance : public AsyncUpdater {
     static void registerLuaClass(char const* object);
     static bool isLuaClass(hash32 objectNameHash);
 
-    virtual void updateConsole(int numMessages, bool newWarning) = 0;
+    virtual void updateConsole(SmallString const& message, bool isWarning, int numMessages, bool newWarning) = 0;
 
     virtual void titleChanged() = 0;
 

Source/PluginEditor.cpp

@@ -6,6 +6,7 @@
 
 #include <juce_gui_basics/juce_gui_basics.h>
 #include <juce_audio_processors/juce_audio_processors.h>
+#include <juce_animation/juce_animation.h>
 
 #include "Utility/Config.h"
 #include "Utility/Fonts.h"
@@ -26,6 +27,7 @@
 #include "Canvas.h"
 #include "Connection.h"
 #include "Components/ConnectionMessageDisplay.h"
+#include "Components/ConsoleMessageDisplay.h"
 #include "Dialogs/Dialogs.h"
 #include "Statusbar.h"
 #include "Toolbar.h"
@@ -104,6 +106,7 @@ PluginEditor::PluginEditor(PluginProcessor& p)
         return true; })
     , tabComponent(this)
     , pluginMode(nullptr)
+    , consoleMessageDisplay(std::make_unique<ConsoleMessageDisplay>(this))
     , touchSelectionHelper(std::make_unique<TouchSelectionHelper>(this))
     , recentlyOpenedPanelSelector(Icons::Home, "Home")
     , libraryPanelSelector(Icons::ItemGrid, "Library")
@@ -260,6 +263,9 @@ PluginEditor::PluginEditor(PluginProcessor& p)
     statusbar->setAlwaysOnTop(true);
     addAndMakeVisible(statusbar.get());
 
+    consoleMessageDisplay->setAlwaysOnTop(true);
+    addAndMakeVisible(consoleMessageDisplay.get());
+
     audioToolbar = std::make_unique<AudioToolbar>(pd, this);
     audioToolbar->setAlwaysOnTop(true);
     addAndMakeVisible(audioToolbar.get());
@@ -449,19 +455,27 @@ void PluginEditor::renderArea(NVGcontext* nvg, Rectangle<int> const area)
         } else {
             tabComponent.renderArea(nvg, area);
 
+            if(sidebar->isHidden())
+                sidebar->renderButtonsOnCanvas(nvg);
+
+            Graphics g(*getNanoLLGC());
             if (touchSelectionHelper && touchSelectionHelper->getParentComponent() && touchSelectionHelper->isVisible() && area.intersects(touchSelectionHelper->getBounds() - nvgSurface.getPosition())) {
                 NVGScopedState scopedState(nvg);
                 nvgTranslate(nvg, touchSelectionHelper->getX() - nvgSurface.getX(), touchSelectionHelper->getY() - nvgSurface.getY());
-                touchSelectionHelper->render(nvg);
+                touchSelectionHelper->paintEntireComponent(g, false);
             }
 
-            if(sidebar->isHidden())
-                sidebar->renderButtonsOnCanvas(nvg);
-
             {
                 NVGScopedState scopedState(nvg);
                 nvgTranslate(nvg, statusbar->getX() - nvgSurface.getX(), statusbar->getY() - nvgSurface.getY());
-                statusbar->render(nvg);
+                statusbar->paintEntireComponent(g, false);
+            }
+
+            if(consoleMessageDisplay->isVisible())
+            {
+                NVGScopedState scopedState(nvg);
+                nvgTranslate(nvg, consoleMessageDisplay->getX() - nvgSurface.getX(), consoleMessageDisplay->getY() - nvgSurface.getY());
+                consoleMessageDisplay->paintEntireComponent(g, false);
             }
         }
     }
@@ -590,14 +604,15 @@ void PluginEditor::resized()
     redoButton.setBounds(2 * buttonDistance + offset, 0, buttonSize, buttonSize);
     addObjectMenuButton.setBounds(3 * buttonDistance + offset, 0, buttonSize, buttonSize);
 
+    auto statusbarBounds = getLocalBounds().removeFromBottom(46).translated(0, -12);
     if (SettingsFile::getInstance()->isUsingTouchMode()) {
-        auto statusbarBounds = getLocalBounds().removeFromBottom(48).translated(0, -12);
-        touchSelectionHelper->setBounds(statusbarBounds.withSizeKeepingCentre(192, 48));
+        touchSelectionHelper->setBounds(statusbarBounds.withSizeKeepingCentre(192, 46));
         statusbar->setBounds(statusbarBounds.removeFromLeft(208).translated(4, 0));
+        consoleMessageDisplay->setBounds(statusbarBounds.removeFromRight(consoleMessageDisplay->getDesiredWidth() + 2).translated(-8, 0));
     }
     else {
-        auto statusbarBounds = getLocalBounds().removeFromBottom(48).withSizeKeepingCentre(204, 48).translated(0, -12);
-        statusbar->setBounds(statusbarBounds);
+        statusbar->setBounds(statusbarBounds.withSizeKeepingCentre(204, 46));
+        consoleMessageDisplay->setBounds(statusbarBounds.removeFromRight(consoleMessageDisplay->getDesiredWidth() + 2).translated(-8, 0));
     }
 
 #if JUCE_IOS
@@ -878,6 +893,12 @@ void PluginEditor::installPackage(File const& file)
     }
 }
 
+void PluginEditor::updateConsole(SmallString const& message, bool messageIsWarning, int numMessages, bool newWarning)
+{
+    sidebar->updateConsole(numMessages, newWarning);
+    if(sidebar->isHidden())
+        consoleMessageDisplay->showMessage(message, messageIsWarning);
+}
 
 TabComponent& PluginEditor::getTabComponent()
 {

Source/PluginEditor.h

@@ -37,6 +37,7 @@ class TouchSelectionHelper;
 class WelcomePanel;
 class CalloutArea;
 class NVGGraphicsContext;
+class ConsoleMessageDisplay;
 class PluginEditor final : public AudioProcessorEditor
     , public Value::Listener
     , public ApplicationCommandTarget
@@ -96,6 +97,8 @@ class PluginEditor final : public AudioProcessorEditor
 
     void installPackage(File const& file);
 
+    void updateConsole(SmallString const& message, bool isWarning, int numMessages, bool newWarning);
+
     bool isInterestedInFileDrag(StringArray const& files) override;
     void filesDropped(StringArray const& files, int x, int y) override;
     void fileDragEnter(StringArray const&, int, int) override;
@@ -169,6 +172,7 @@ class PluginEditor final : public AudioProcessorEditor
 
 public:
     std::unique_ptr<PluginMode> pluginMode;
+    std::unique_ptr<ConsoleMessageDisplay> consoleMessageDisplay;
 
 private:
     std::unique_ptr<TouchSelectionHelper> touchSelectionHelper;

Source/PluginProcessor.cpp

@@ -2237,10 +2237,10 @@ void PluginProcessor::parseDataBuffer(XmlElement const& xml)
     }
 }
 
-void PluginProcessor::updateConsole(int const numMessages, bool const newWarning)
+void PluginProcessor::updateConsole(SmallString const& message, bool isWarning, int const numMessages, bool const newWarning)
 {
-    for (auto const* editor : getEditors()) {
-        editor->sidebar->updateConsole(numMessages, newWarning);
+    for (auto* editor : getEditors()) {
+        editor->updateConsole(message, isWarning, numMessages, newWarning);
     }
 }
 

Source/PluginProcessor.h

@@ -108,7 +108,7 @@ class PluginProcessor final : public AudioProcessor
     void clearTextEditor(uint64_t ptr) override;
     bool isTextEditorDialogShown(uint64_t ptr) override;
 
-    void updateConsole(int numMessages, bool newWarning) override;
+    void updateConsole(SmallString const& message, bool isWarning, int numMessages, bool newWarning) override;
 
     void reloadAbstractions(File changedPatch, t_glist* except) override;
 

Source/Statusbar.cpp

@@ -5,6 +5,8 @@
 */
 
 #include <juce_gui_basics/juce_gui_basics.h>
+#include <juce_animation/juce_animation.h>
+
 #include "Utility/Config.h"
 #include "Utility/Fonts.h"
 
@@ -206,7 +208,6 @@ class CanvasModePicker final : public Component {
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CanvasModePicker)
 };
 
-// New statusbar
 Statusbar::Statusbar(PluginProcessor* processor, PluginEditor* e)
     : NVGComponent(this)
     , pd(processor)

Source/Statusbar.h

@@ -55,11 +55,6 @@ class Statusbar final : public Component
 
     ~Statusbar() override;
 
-    void render(NVGcontext* nvg) override
-    {
-        componentImage.renderJUCEComponent(nvg, *this, 2.0f);
-    }
-
     void updateZoomLevel() { triggerAsyncUpdate(); }
 
     void setEditButtonState(bool locked, bool present = false);
@@ -82,7 +77,6 @@ class Statusbar final : public Component
     std::unique_ptr<StatusbarButtonGroup> overlayGroup;
     std::unique_ptr<StatusbarButtonGroup> editModeGroup;
 
-    NVGImage componentImage;
     bool welcomePanelIsShown = false;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(Statusbar)