Merge pull request #1968 from alcomposer/larger-new-open

Larger new open

Author: timothyschoen

Resources/Fonts/IconFont.ttf

@@ -22,6 +22,9 @@ class BouncingViewportAttachment : public MouseListener
 public:
     void mouseWheelMove(MouseEvent const& e, MouseWheelDetails const& wheel) override
     {
+        if (!isBounceable)
+            return;
+
         // Protect against receiving the same even twice
         if (e.eventTime == lastScrollTime)
             return;
@@ -60,6 +63,11 @@ class BouncingViewportAttachment : public MouseListener
         update();
     }
 
+    void setBounce(bool shouldBounce)
+    {
+        isBounceable = shouldBounce;
+    }
+
 private:
     static int rescaleMouseWheelDistance(float distance) noexcept
     {
@@ -109,6 +117,7 @@ class BouncingViewportAttachment : public MouseListener
     bool wasSmooth = false;
     Point<float> offset = { 0, 0 };
     Time lastScrollTime;
+    bool isBounceable = true;
 };
 
 class BouncingViewport : public Viewport {
@@ -118,6 +127,12 @@ class BouncingViewport : public Viewport {
     {
     }
 
+    void setBounce(bool shouldBounce)
+    {
+        bouncer.setBounce(shouldBounce);
+    }
+
 private:
     BouncingViewportAttachment bouncer;
+
 };

Source/Components/BouncingViewport.h

@@ -116,6 +116,8 @@ struct Icons {
     inline static String const AlignVCentre = "9";
     inline static String const AlignVDistribute = "*";
 
+    inline static String const Home = CharPointer_UTF8("\x1F");
+
     // ================== OBJECT ICONS ==================
 
     // generic

Source/Components/WelcomePanel.h

@@ -8,6 +8,7 @@
 
 #include "PluginEditor.h"
 #include "Utility/Autosave.h"
+#include "Components/WelcomePanel.h"
 
 class MainMenu : public PopupMenu {
 
@@ -44,8 +45,11 @@ class MainMenu : public PopupMenu {
             auto isActive = menuItems[2]->isActive = recentlyOpenedTree.getNumChildren() > 0;
             if (isActive) {
                 recentlyOpened->addSeparator();
-                recentlyOpened->addItem("Clear recently opened", [recentlyOpenedTree]() mutable {
+                recentlyOpened->addItem("Clear recently opened", [recentlyOpenedTree, editor]() mutable {
                     recentlyOpenedTree.removeAllChildren(nullptr);
+                    // Make sure to clear the recent items in the current welcome panel
+                    if (editor->welcomePanel)
+                        editor->welcomePanel->triggerAsyncUpdate();
                     SettingsFile::getInstance()->reloadSettings();
                 });
             }

Source/Constants.h

@@ -152,7 +152,7 @@ void NVGSurface::initialise()
     nvgCreateFontMem(nvg, "Inter-Bold", (unsigned char*)BinaryData::InterBold_ttf, BinaryData::InterBold_ttfSize, 0);
     nvgCreateFontMem(nvg, "Inter-SemiBold", (unsigned char*)BinaryData::InterSemiBold_ttf, BinaryData::InterSemiBold_ttfSize, 0);
     nvgCreateFontMem(nvg, "Inter-Tabular", (unsigned char*)BinaryData::InterTabular_ttf, BinaryData::InterTabular_ttfSize, 0);
-    nvgCreateFontMem(nvg, "icon_font-Regular", (unsigned char*)BinaryData::IconFont_ttf, BinaryData::IconFont_ttfSize, 0);
+    nvgCreateFontMem(nvg, "plugdata_icon_font", (unsigned char*)BinaryData::IconFont_ttf, BinaryData::IconFont_ttfSize, 0);
 
     invalidateAll();
 }

Source/Dialogs/MainMenu.h

@@ -257,7 +257,7 @@ class NumboxTildeObject final : public ObjectBase
 
         auto icon = mode ? Icons::ThinDown : Icons::Sine;
         auto iconBounds = Rectangle<int>(7, 3, getHeight(), getHeight());
-        nvgFontFace(nvg, "icon_font-Regular");
+        nvgFontFace(nvg, "plugdata_icon_font");
         nvgFontSize(nvg, 12.0f);
         nvgFillColor(nvg, convertColour(cnv->editor->getLookAndFeel().findColour(PlugDataColour::dataColourId)));
         nvgTextAlign(nvg, NVG_ALIGN_TOP | NVG_ALIGN_LEFT);

Source/NVGSurface.cpp

@@ -153,7 +153,7 @@ PluginEditor::PluginEditor(PluginProcessor& p)
     , tabComponent(this)
     , pluginMode(nullptr)
     , touchSelectionHelper(std::make_unique<TouchSelectionHelper>(this))
-    , recentlyOpenedPanelSelector(Icons::History, "Recent")
+    , recentlyOpenedPanelSelector(Icons::Home, "Home")
     , libraryPanelSelector(Icons::ItemGrid, "Library")
 {
     keyboardLayout = OSUtils::getKeyboardLayout();

Source/Objects/NumboxTildeObject.h

@@ -70,7 +70,8 @@ struct Fonts {
             fontHeight = bounds.getHeight() / 1.2f;
 
         auto justification = centred ? Justification::centred : Justification::centredLeft;
-        g.setFont(Fonts::getIconFont().withHeight(fontHeight));
+        auto font = Fonts::getIconFont().withHeight(fontHeight);
+        g.setFont(font);
         g.setColour(colour);
         g.drawText(icon, bounds, justification, false);
     }

Source/PluginEditor.cpp

@@ -367,9 +367,10 @@ void NanoVGGraphicsContext::setFont(juce::Font const& f)
 {
     font = f;
     auto typefaceName = font.getTypefacePtr()->getName();
+
     if (typefaceName.contains(" "))
         typefaceName = typefaceName.replace(" ", "-");
-    else
+    else if (font.getTypefaceStyle().isNotEmpty())
         typefaceName += "-" + font.getTypefaceStyle();
 
     if (!loadedFonts.count(typefaceName)) {