Preselect sub menus and patch items in PatchSelector (surge-synthesiz…

…er#6859) * Preselect sub menus and patch items in PatchSelector * "static constexpr int" instead of "#define" for the id for preselected menu items. --------- Co-authored-by: Alexandr Zyurkalov <[email protected]>
baconpaul · Feb 27, 2023 · 0189187 · 0189187
1 parent e46dbfc
commit 0189187
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -49,3 +49,4 @@ Vincent Zauhar <[email protected]>
 Marty Lake <[email protected]>
 David Carlier <[email protected]>
 Xenakios <[email protected]>
+Alexandr Zyurkalov <[email protected]>
diff --git a/doc/Developer Guide.md b/doc/Developer Guide.md
@@ -64,7 +64,7 @@ If your IDE is set to auto-format cmake files make sure to configure it accordin
 
 ### Naming
 
-* `#define` constants are `UPPERCASE_VARIABLES`
+* used to `#define` constants as `UPPERCASE_VARIABLES`, but prefer `static constexpr <type> UPPERCASE_VARIABLES`. 
 * `class HaveCamelCaseNames`
 * `void functionsAreCamelCaseWithLowerFirst`
 * We are not using `s_` or `m_` or equivalent notations for members or statics

diff --git a/src/surge-xt/gui/widgets/PatchSelector.cpp b/src/surge-xt/gui/widgets/PatchSelector.cpp
@@ -28,6 +28,13 @@
 #include "AccessibleHelpers.h"
 #include "SurgeJUCEHelpers.h"
 
+/*
+ * It is an arbitrary number that we set as an ID for patch menu items.
+ * It is not necessarily to be unique among all menu items, only among a sub menu, so it can
+ * be a constant.
+ */
+static constexpr int ID_TO_PRESELECT_MENU_ITEMS = 636133;
+
 namespace Surge
 {
 namespace Widgets
@@ -743,7 +750,8 @@ void PatchSelector::showClassicMenu(bool single_category)
 
     if (sge)
     {
-        o = sge->popupMenuOptions(getBounds().getBottomLeft());
+        o = sge->popupMenuOptions(getBounds().getBottomLeft())
+                .withInitiallySelectedItem(ID_TO_PRESELECT_MENU_ITEMS);
     }
 
     contextMenu.showMenuAsync(o, [that = juce::Component::SafePointer(this)](int) {
@@ -1006,6 +1014,9 @@ bool PatchSelector::populatePatchMenuForCategory(int c, juce::PopupMenu &context
             auto item = juce::PopupMenu::Item(name).setEnabled(true).setTicked(thisCheck).setAction(
                 [this, p]() { this->loadPatch(p); });
 
+            if (thisCheck)
+                item.setID(ID_TO_PRESELECT_MENU_ITEMS);
+
             if (isFav && associatedBitmapStore)
             {
                 auto img = associatedBitmapStore->getImage(IDB_FAVORITE_MENU_ICON);
@@ -1068,7 +1079,11 @@ bool PatchSelector::populatePatchMenuForCategory(int c, juce::PopupMenu &context
 
         if (!single_category)
         {
-            contextMenu.addSubMenu(name, *subMenu, true, nullptr, amIChecked);
+            if (amIChecked)
+                contextMenu.addSubMenu(name, *subMenu, true, nullptr, amIChecked,
+                                       ID_TO_PRESELECT_MENU_ITEMS);
+            else
+                contextMenu.addSubMenu(name, *subMenu, true, nullptr, amIChecked);
         }
 
         main_e++;