Dynamic Patch Fonts (#5571)

1. If the default patcn name overlaps with category or author, drop the "Category: " and "By: " prefix 2. If it sitll overlaps dynamically size it and push it to top of box to avoid overlaps Closes #5564
surge-synthesizer · Dec 6, 2021 · 4d8cbb4 · 4d8cbb4
1 parent 5873a27
commit 4d8cbb4
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/src/surge-xt/gui/widgets/PatchSelector.cpp b/src/surge-xt/gui/widgets/PatchSelector.cpp
@@ -186,16 +186,54 @@ void PatchSelector::paint(juce::Graphics &g)
     // patch name
     if (!isTypeaheadSearchOn)
     {
+        auto catsz = Surge::GUI::getFontManager()->displayFont.getStringWidthFloat(category);
+        auto authsz = Surge::GUI::getFontManager()->displayFont.getStringWidthFloat(author);
+
+        auto catszwith =
+            Surge::GUI::getFontManager()->displayFont.getStringWidthFloat("Category: " + category);
+        auto authszwith =
+            Surge::GUI::getFontManager()->displayFont.getStringWidthFloat("By: " + author);
+        auto mainsz = Surge::GUI::getFontManager()->patchNameFont.getStringWidthFloat(pname);
+
+        bool useCatAndBy{false}, alignTop{false};
+
+        /*
+         * Would the main text overlap with the category or author if we add "Category: " or "By: "?
+         * That's the same as if the category with + half the size is less that the width / 2.
+         * Add a 3 px extra buffer too just to stop exact hits
+         */
+        if ((catszwith + mainsz / 2) < getWidth() / 2 - 3 &&
+            (authszwith + mainsz / 2) < getWidth() / 2 - 3)
+        {
+            useCatAndBy = true;
+        }
+
+        /*
+         * Alternately if the category without and the name clash then the name will
+         * draw fitted but since the rectangles overlap we need to push it to the top
+         * of the box
+         */
+        if ((catsz + mainsz / 2) > getWidth() / 2 || (authsz + mainsz / 2) > getWidth() / 2)
+        {
+            alignTop = true;
+        }
+
         auto pnRect =
             pbrowser.withLeft(searchRect.getRight()).withRight(favoritesRect.getX()).reduced(4, 0);
 
         g.setFont(Surge::GUI::getFontManager()->patchNameFont);
-        g.drawFittedText(pname, pnRect, juce::Justification::centred, 1);
+        g.drawFittedText(pname, pnRect,
+                         alignTop ? juce::Justification::centredTop : juce::Justification::centred,
+                         1, 0.1);
+
+        g.setColour(skin->getColor(Colors::PatchBrowser::Text));
 
         // category/author name
         g.setFont(Surge::GUI::getFontManager()->displayFont);
-        g.drawText(category, cat, juce::Justification::centredLeft);
-        g.drawText(author, auth,
+
+        g.drawText((useCatAndBy ? "Category: " : "") + category, cat,
+                   juce::Justification::centredLeft);
+        g.drawText((useCatAndBy ? "By: " : "") + author, auth,
                    skin->getVersion() >= 2 ? juce::Justification::centredRight
                                            : juce::Justification::centredLeft);
     }

diff --git a/src/surge-xt/gui/widgets/PatchSelector.h b/src/surge-xt/gui/widgets/PatchSelector.h
@@ -69,7 +69,7 @@ struct PatchSelector : public juce::Component,
     {
         if (l.length())
         {
-            category = "Category: " + path_to_string(string_to_path(l).filename());
+            category = path_to_string(string_to_path(l).filename());
         }
         else
         {
@@ -83,7 +83,7 @@ struct PatchSelector : public juce::Component,
     {
         if (l.length())
         {
-            author = "By: " + l;
+            author = l;
         }
         else
         {