Fix a couple of MultiSwitch problems (#5146)

1. Frame wasn't observed in hover 2. Some cursor changes when dragging make it seem more natural Closes #5114
surge-synthesizer · Sep 23, 2021 · 691151c · 691151c
1 parent 055c9fa
commit 691151c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/src/surge-xt/gui/SurgeGUIEditor.cpp b/src/surge-xt/gui/SurgeGUIEditor.cpp
@@ -4296,6 +4296,7 @@ SurgeGUIEditor::layoutComponentForSkin(std::shared_ptr<Surge::GUI::Skin::Control
             auto drgb = currentSkin->propertyValue(skinCtrl,
                                                    Surge::Skin::Component::DRAGGABLE_HSWITCH, "1");
             auto hsw = componentForSkinSession<Surge::Widgets::MultiSwitch>(skinCtrl->sessionid);
+            hsw->setStorage(&(synth->storage));
             hsw->setRows(std::atoi(rows.c_str()));
             hsw->setColumns(std::atoi(cols.c_str()));
             hsw->setTag(tag);

diff --git a/src/surge-xt/gui/widgets/MultiSwitch.cpp b/src/surge-xt/gui/widgets/MultiSwitch.cpp
@@ -18,6 +18,7 @@
 #include "basic_dsp.h"
 #include "AccessibleHelpers.h"
 #include "SurgeGUIEditor.h"
+#include "SurgeGUIUtils.h"
 
 namespace Surge
 {
@@ -65,7 +66,7 @@ int MultiSwitch::coordinateToSelection(int x, int y)
 
     if (columns * rows > 1)
     {
-        return (mx + my * columns);
+        return limit_range(mx + my * columns, 0, columns * rows - 1);
     }
 
     return 0;
@@ -86,6 +87,7 @@ void MultiSwitch::mouseDown(const juce::MouseEvent &event)
         return;
     }
 
+    everDragged = false;
     if (event.mods.isPopupMenu())
     {
         notifyControlModifierClicked(event.mods);
@@ -111,16 +113,40 @@ void MultiSwitch::mouseDrag(const juce::MouseEvent &event)
 {
     if (draggable)
     {
+        if (!Surge::GUI::showCursor(storage) && !everDragged &&
+            event.getDistanceFromDragStart() > 0)
+        {
+            everDragged = true;
+            if (rows * columns > 1)
+            {
+                if (rows > columns)
+                    setMouseCursor(juce::MouseCursor::UpDownResizeCursor);
+                else
+                    setMouseCursor(juce::MouseCursor::LeftRightResizeCursor);
+            }
+            // juce::Desktop::getInstance().getMainMouseSource().enableUnboundedMouseMovement(true);
+        }
+
         int sel = coordinateToSelection(event.x, event.y);
         hoverSelection = sel;
         setValue(limit_range((float)sel / (rows * columns - 1), 0.f, 1.f));
         notifyValueChanged();
     }
 }
 
+void MultiSwitch::mouseUp(const juce::MouseEvent &event)
+{
+    if (everDragged)
+    {
+        everDragged = false;
+        setMouseCursor(juce::MouseCursor::NormalCursor);
+        // juce::Desktop::getInstance().getMainMouseSource().enableUnboundedMouseMovement(false);
+    }
+}
 void MultiSwitch::mouseEnter(const juce::MouseEvent &event)
 {
     hoverSelection = coordinateToSelection(event.x, event.y);
+
     isHovered = true;
 }
 void MultiSwitch::mouseExit(const juce::MouseEvent &event) { endHover(); }

diff --git a/src/surge-xt/gui/widgets/MultiSwitch.h b/src/surge-xt/gui/widgets/MultiSwitch.h
@@ -22,6 +22,7 @@
 #include "juce_gui_basics/juce_gui_basics.h"
 
 class SurgeImage;
+class SurgeStorage;
 
 namespace Surge
 {
@@ -36,6 +37,9 @@ struct MultiSwitch : public juce::Component, public WidgetBaseMixin<MultiSwitch>
     MultiSwitch();
     ~MultiSwitch();
 
+    SurgeStorage *storage{nullptr};
+    void setStorage(SurgeStorage *s) { storage = s; }
+
     int rows{0}, columns{0}, heightOfOneImage{0}, frameOffset{0};
     int getRows() const { return rows; }
     int getColumns() const { return columns; }
@@ -60,11 +64,14 @@ struct MultiSwitch : public juce::Component, public WidgetBaseMixin<MultiSwitch>
     void setDraggable(bool d) { draggable = d; }
 
     void paint(juce::Graphics &g) override;
+
+    bool everDragged{false};
     void mouseDown(const juce::MouseEvent &event) override;
     void mouseEnter(const juce::MouseEvent &event) override;
     void mouseExit(const juce::MouseEvent &event) override;
     void mouseMove(const juce::MouseEvent &event) override;
     void mouseDrag(const juce::MouseEvent &event) override;
+    void mouseUp(const juce::MouseEvent &event) override;
 
     void endHover() override;