Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: Implemented keyboard shortcut Alt to perform a centered resize #6586

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feat: Implemented keyboard shortcut Alt to perform a centered resize #6586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions newIDE/app/src/InstancesEditor/InstancesResizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -210,14 +211,17 @@ export default class InstancesResizer {
: roundedTotalDeltaX;
const flippedTotalDeltaY = isTop ? -roundedTotalDeltaY : roundedTotalDeltaY;

// While rezising both sides, TotalDelta must be doubled
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// While rezising both sides, TotalDelta must be doubled
// While resizing both sides, TotalDelta must be doubled.

const altOffset = centeredResize ? 2 : 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

altOffset is not very meaningful as a variable name. Can you think of something that represents this factor?


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;
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion newIDE/app/src/InstancesEditor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,8 @@ export default class InstancesEditor extends Component<Props> {
sceneDeltaY,
grabbingLocation,
proportional,
this.keyboardShortcuts.shouldNotSnapToGrid()
this.keyboardShortcuts.shouldNotSnapToGrid(),
this.keyboardShortcuts.shouldCenteredResize()
);
};

Expand Down
4 changes: 4 additions & 0 deletions newIDE/app/src/UI/KeyboardShortcuts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ export default class KeyboardShortcuts {
return this._altPressed;
}

shouldCenteredResize() {
return this._altPressed;
}

shouldMoveView() {
return this._spacePressed || this._mouseMidButtonPressed;
}
Expand Down