Merge branch 'develop' of https://github.com/plugdata-team/plugdata i…

…nto develop
plugdata-team · Oct 27, 2023 · 9def938 · 9def938
2 parents 54f4ea0 + 078f8de
commit 9def938
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/ObjectGrid.cpp b/Source/ObjectGrid.cpp
@@ -67,7 +67,7 @@ void ObjectGrid::propertyChanged(String const& name, var const& value)
 
 Point<int> ObjectGrid::performMove(Object* toDrag, Point<int> dragOffset)
 {
-    if (ModifierKeys::getCurrentModifiers().isShiftDown() || gridType == 0) {
+    if (ModifierKeys::getCurrentModifiers().isShiftDown() || gridType == 0 || !gridEnabled) {
         clearIndicators();
         return dragOffset;
     }
@@ -201,7 +201,7 @@ Point<int> ObjectGrid::performMove(Object* toDrag, Point<int> dragOffset)
 
 Point<int> ObjectGrid::performResize(Object* toDrag, Point<int> dragOffset, Rectangle<int> newResizeBounds)
 {
-    if (ModifierKeys::getCurrentModifiers().isShiftDown() || gridType == 0) {
+    if (ModifierKeys::getCurrentModifiers().isShiftDown() || gridType == 0 || !gridEnabled) {
         clearIndicators();
         return dragOffset;
     }