Feat: Implemented keyboard shortcut Alt to perform a centered resize

While holding the Alt key and resizing an instance, both sides are resized. This was achieved by doubling the scaling factor and updating the new X and Y coordinates without using a fixedPoint. Closes issue #6160 Co-authored-by: David Palma <[email protected]>
4ian · May 22, 2024 · 9593d8f · 9593d8f
1 parent 92b9203
commit 9593d8f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/newIDE/app/src/InstancesEditor/InstancesResizer.js b/newIDE/app/src/InstancesEditor/InstancesResizer.js
@@ -139,7 +139,8 @@ export default class InstancesResizer {
     deltaY: number,
     grabbingLocation: ResizeGrabbingLocation,
     proportional: boolean,
-    noGridSnap: boolean
+    noGridSnap: boolean,
+    centeredResize: boolean
   ) {
     this.totalDeltaX += deltaX;
     this.totalDeltaY += deltaY;
@@ -210,14 +211,17 @@ export default class InstancesResizer {
       : roundedTotalDeltaX;
     const flippedTotalDeltaY = isTop ? -roundedTotalDeltaY : roundedTotalDeltaY;
 
+    // While rezising both sides, TotalDelta must be doubled
+    const altOffset = centeredResize ? 2 : 1;
+
     let scaleX =
       initialSelectionAABB.width() !== 0
-        ? (initialSelectionAABB.width() + flippedTotalDeltaX) /
+        ? (initialSelectionAABB.width() + flippedTotalDeltaX * altOffset) /
           initialSelectionAABB.width()
         : flippedTotalDeltaX;
     let scaleY =
       initialSelectionAABB.height() !== 0
-        ? (initialSelectionAABB.height() + flippedTotalDeltaY) /
+        ? (initialSelectionAABB.height() + flippedTotalDeltaY * altOffset) /
           initialSelectionAABB.height()
         : flippedTotalDeltaY;
     let scaleZ = 1;
@@ -348,12 +352,21 @@ export default class InstancesResizer {
         newWidth = scaleX * initialWidth;
         newHeight = scaleY * initialHeight;
         newDepth = scaleZ * initialDepth;
-        newX =
-          (initialInstanceOriginPosition.x - fixedPointX) * scaleX +
-          fixedPointX;
-        newY =
-          (initialInstanceOriginPosition.y - fixedPointY) * scaleY +
-          fixedPointY;
+
+        if (centeredResize) {
+          // fixedPoint will not be needed since resize will be done in both sides
+          newX =
+            initialInstanceOriginPosition.x + (initialWidth - newWidth) / 2;
+          newY =
+            initialInstanceOriginPosition.y + (initialHeight - newHeight) / 2;
+        } else {
+          newX =
+            (initialInstanceOriginPosition.x - fixedPointX) * scaleX +
+            fixedPointX;
+          newY =
+            (initialInstanceOriginPosition.y - fixedPointY) * scaleY +
+            fixedPointY;
+        }
       }
 
       // After resizing, we round the new positions and dimensions to the nearest pixel.

diff --git a/newIDE/app/src/InstancesEditor/index.js b/newIDE/app/src/InstancesEditor/index.js
@@ -977,7 +977,8 @@ export default class InstancesEditor extends Component<Props> {
       sceneDeltaY,
       grabbingLocation,
       proportional,
-      this.keyboardShortcuts.shouldNotSnapToGrid()
+      this.keyboardShortcuts.shouldNotSnapToGrid(),
+      this.keyboardShortcuts.shouldCenteredResize()
     );
   };
 

diff --git a/newIDE/app/src/UI/KeyboardShortcuts/index.js b/newIDE/app/src/UI/KeyboardShortcuts/index.js
@@ -118,6 +118,10 @@ export default class KeyboardShortcuts {
     return this._altPressed;
   }
 
+  shouldCenteredResize() {
+    return this._altPressed;
+  }
+
   shouldMoveView() {
     return this._spacePressed || this._mouseMidButtonPressed;
   }