JannisX11/blockbench
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue with switching tools while using transform gizmo

Browse Source
This commit is contained in:
JannisX11 2021-06-06 09:52:17 +02:00
parent 57491792b2
commit 395b94f662
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/interface/actions.js
View File

@ -334,6 +334,9 @@ class Tool extends Action {
if (typeof Toolbox.selected.onUnselect == 'function') {
Toolbox.selected.onUnselect()
}
if (Transformer.dragging) {
Transformer.cancelMovement({}, true);
}
}
Toolbox.selected = this;
delete Toolbox.original;

4
js/interface/keyboard.js
View File

@ -528,8 +528,8 @@ $(document).on('keydown mousedown', function(e) {
alt.select()
Toolbox.original = orig
}
} else if (Keybinds.extra.cancel.keybind.isTriggered(e) && (Transformer.dragging/* || ...*/)) {
Undo.cancelEdit()
} else if (Keybinds.extra.cancel.keybind.isTriggered(e) && (Transformer.dragging)) {
Transformer.cancelMovement(e, false);
}
//Keybinds
if (!input_focus) {

14
js/preview/transformer.js
View File

@ -933,6 +933,10 @@
}
}
}
this.cancelMovement = function(event, keep_changes = false) {
onPointerUp(event, keep_changes);
Undo.cancelEdit();
}
function displayDistance(number) {
Blockbench.setStatusBarText(trimFloatNumber(number));
}
@ -1479,7 +1483,7 @@
scope.dispatchEvent( changeEvent );
scope.dispatchEvent( objectChangeEvent );
}
function onPointerUp( event ) {
function onPointerUp( event, keep_changes = true ) {
//event.preventDefault(); // Prevent MouseEvent on mobile
document.removeEventListener( "mouseup", onPointerUp );
scope.dragging = false
@ -1511,11 +1515,11 @@
delete obj.oldScale;
delete obj.oldCenter;
})
if (scope.hasChanged) {
if (scope.hasChanged && keep_changes) {
Undo.finishEdit('resize')
}
} else if (scope.axis !== null && scope.hasChanged) {
} else if (scope.axis !== null && scope.hasChanged && keep_changes) {
if (Toolbox.selected.id == 'pivot_tool') {
Undo.finishEdit('move pivot')
@ -1527,10 +1531,10 @@
}
updateSelection()
} else if (Modes.id === 'animate' && scope.keyframes && scope.keyframes.length) {
} else if (Modes.id === 'animate' && scope.keyframes && scope.keyframes.length && keep_changes) {
Undo.finishEdit('change keyframe', {keyframes: scope.keyframes})
} else if (Modes.id === 'display') {
} else if (Modes.id === 'display' && keep_changes) {
Undo.finishEdit('edit display slot')
}