From ef5b5c122680b9f3ddf6ac6d5822dcf3760c2dfb Mon Sep 17 00:00:00 2001 From: JannisX11 Date: Thu, 1 Jul 2021 21:05:02 +0200 Subject: [PATCH] Add option to bring back old Alt Tool functionality --- js/interface/keyboard.js | 4 ++-- js/preview/transformer.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/interface/keyboard.js b/js/interface/keyboard.js index 6d06e562..bf109550 100644 --- a/js/interface/keyboard.js +++ b/js/interface/keyboard.js @@ -492,7 +492,7 @@ window.addEventListener('focus', event => { if (event.altKey && Toolbox.selected.alt_tool && !Toolbox.original && !open_interface) { var orig = Toolbox.selected; var alt = BarItems[Toolbox.selected.alt_tool]; - if (alt && Condition(alt) && Modes.paint) { + if (alt && Condition(alt) && (Modes.paint || BarItems.swap_tools.keybind.key == 18)) { alt.select() Toolbox.original = orig; } @@ -597,7 +597,7 @@ addEventListeners(document, 'keydown mousedown', function(e) { //Alt Tool var orig = Toolbox.selected; var alt = BarItems[Toolbox.selected.alt_tool] - if (alt && Condition(alt) && Modes.paint) { + if (alt && Condition(alt) && (Modes.paint || BarItems.swap_tools.keybind.key == 18)) { alt.select() Toolbox.original = orig } diff --git a/js/preview/transformer.js b/js/preview/transformer.js index 4805aef3..52a897e6 100644 --- a/js/preview/transformer.js +++ b/js/preview/transformer.js @@ -1236,7 +1236,7 @@ selected.forEach(function(obj, i) { if (obj.resizable) { - obj.resize(point[axis], axisNumber, !scope.direction, null, event.altKey || Pressing.overrides.alt) + obj.resize(point[axis], axisNumber, !scope.direction, null, (event.altKey || Pressing.overrides.alt) && BarItems.swap_tools.keybind.key != 18) } }) displayDistance(point[axis] * (scope.direction ? 1 : -1));