Added option to XY-Dragger for radius and sensitivity

ffAudio · Dec 3, 2020 · b069da1 · b069da1
1 parent 234a64b
commit b069da1
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/General/foleys_MagicJUCEFactories.cpp b/General/foleys_MagicJUCEFactories.cpp
@@ -478,6 +478,8 @@ class XYDraggerItem : public GuiItem
 
     static const juce::Identifier  pCrosshair;
     static const juce::StringArray pCrosshairTypes;
+    static const juce::Identifier  pRadius;
+    static const juce::Identifier  pSenseFactor;
 
     XYDraggerItem (MagicGUIBuilder& builder, const juce::ValueTree& node)
       : GuiItem (builder, node)
@@ -523,6 +525,14 @@ class XYDraggerItem : public GuiItem
             dragger.setCrossHair (false, true);
         else
             dragger.setCrossHair (true, true);
+
+        auto radius = getProperty (pRadius);
+        if (! radius.isVoid())
+            dragger.setRadius (radius);
+
+        auto factor = getProperty (pSenseFactor);
+        if (! factor.isVoid())
+            dragger.setSenseFactor (factor);
     }
 
     std::vector<SettableProperty> getSettableProperties() const override
@@ -533,6 +543,8 @@ class XYDraggerItem : public GuiItem
         props.push_back ({ configNode, IDs::parameterY, SettableProperty::Choice, {}, magicBuilder.createParameterMenuLambda() });
         props.push_back ({ configNode, "right-click", SettableProperty::Choice, {}, magicBuilder.createParameterMenuLambda() });
         props.push_back ({ configNode, pCrosshair, SettableProperty::Choice, {}, magicBuilder.createChoicesMenuLambda (pCrosshairTypes) });
+        props.push_back ({ configNode, pRadius, SettableProperty::Number, {}, {}});
+        props.push_back ({ configNode, pSenseFactor, SettableProperty::Number, {}, {}});
 
         return props;
     }
@@ -549,6 +561,8 @@ class XYDraggerItem : public GuiItem
 };
 const juce::Identifier  XYDraggerItem::pCrosshair       { "xy-crosshair" };
 const juce::StringArray XYDraggerItem::pCrosshairTypes  { "no-crosshair", "vertical", "horizontal", "crosshair" };
+const juce::Identifier  XYDraggerItem::pRadius          { "xy-radius" };
+const juce::Identifier  XYDraggerItem::pSenseFactor     { "xy-sense-factor" };
 
 //==============================================================================
 

diff --git a/VERSION.md b/VERSION.md
@@ -7,6 +7,7 @@ PluginGuiMagic - Versions history
 - Implemented margin and padding with different values on each edge
 - Averted an assert in DropShadow with Sliders (or Components in General) 
   becoming only one pixel
+- Added option to XY-Dragger for radius and sensitivity
 
 1.2.6
 -----

diff --git a/Widgets/foleys_XYDragComponent.cpp b/Widgets/foleys_XYDragComponent.cpp
@@ -38,9 +38,6 @@
 namespace foleys
 {
 
-
-float XYDragComponent::radius = 4.0f;
-
 XYDragComponent::XYDragComponent()
 {
     setOpaque (false);
@@ -113,13 +110,24 @@ void XYDragComponent::setRightClickParameter (juce::RangedAudioParameter* parame
     contextMenuParameter = parameter;
 }
 
+void XYDragComponent::setRadius (float radiusToUse)
+{
+    radius = radiusToUse;
+    repaint();
+}
+
+void XYDragComponent::setSenseFactor (float factor)
+{
+    senseFactor = factor;
+}
+
 void XYDragComponent::updateWhichToDrag (juce::Point<float> pos)
 {
     const auto centre = juce::Point<int> (getXposition(), getYposition()).toFloat();
 
-    mouseOverDot = (centre.getDistanceFrom (pos) < radius * 1.5f);
-    mouseOverX = (wantsHorizontalDrag && std::abs (pos.getX() - centre.getX()) < 3.0f);
-    mouseOverY =  (wantsVerticalDrag && std::abs (pos.getY() - centre.getY()) < 3.0f);
+    mouseOverDot = (centre.getDistanceFrom (pos) < radius * senseFactor);
+    mouseOverX = (wantsHorizontalDrag && std::abs (pos.getX() - centre.getX()) < senseFactor + 1.0f);
+    mouseOverY =  (wantsVerticalDrag && std::abs (pos.getY() - centre.getY()) < senseFactor + 1.0f);
 
     repaint();
 }
@@ -129,13 +137,13 @@ bool XYDragComponent::hitTest (int x, int y)
     const auto click = juce::Point<int> (x, y).toFloat ();
     const auto centre = juce::Point<int> (getXposition (), getYposition ()).toFloat ();
 
-    if (centre.getDistanceFrom (click) < radius * 1.5f)
+    if (centre.getDistanceFrom (click) < radius * senseFactor)
         return true;
 
-    if (wantsHorizontalDrag && std::abs (click.getX() - centre.getX()) < 3.0f)
+    if (wantsHorizontalDrag && std::abs (click.getX() - centre.getX()) < senseFactor + 1.0f)
         return true;
 
-    if (wantsVerticalDrag && std::abs (click.getY() - centre.getY()) < 3.0f)
+    if (wantsVerticalDrag && std::abs (click.getY() - centre.getY()) < senseFactor + 1.0f)
         return true;
 
     return false;

diff --git a/Widgets/foleys_XYDragComponent.h b/Widgets/foleys_XYDragComponent.h
@@ -66,6 +66,9 @@ class XYDragComponent  : public juce::Component
 
     void setRightClickParameter (juce::RangedAudioParameter* parameter);
 
+    void setRadius (float radius);
+    void setSenseFactor (float factor);
+
     bool hitTest (int x, int y) override;
     void mouseDown (const juce::MouseEvent&) override;
     void mouseMove (const juce::MouseEvent&) override;
@@ -93,7 +96,8 @@ class XYDragComponent  : public juce::Component
 
     juce::RangedAudioParameter* contextMenuParameter = nullptr;
 
-    static float radius;
+    float radius = 4.0f;
+    float senseFactor = 2.0f;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (XYDragComponent)
 };