mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2024-11-27 04:21:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add dialog keyboard_actions system

Browse Source
This commit is contained in:
JannisX11 2024-03-13 23:23:10 +01:00
parent 26348afca7
commit 27cff36431
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/interface/dialog.js
View File

@ -558,6 +558,7 @@ window.Dialog = class Dialog {
this.form_first = options.form_first;
this.confirmIndex = options.confirmIndex||0;
this.cancelIndex = options.cancelIndex !== undefined ? options.cancelIndex : this.buttons.length-1;
this.keyboard_actions = options.keyboard_actions || {};
this.onConfirm = options.onConfirm;
this.onCancel = options.onCancel;

31
js/interface/keyboard.js
View File

@ -808,21 +808,16 @@ addEventListeners(document, 'keydown mousedown', function(e) {
// Menu
if (open_menu) {
used = open_menu.keyNavigate(e)||used
} else if (Toolbox.selected.id == 'copy_paste_tool' && UVEditor.texture && Painter.selection.canvas && e.which >= 37 && e.which <= 40) {
switch (e.which) {
case 37: Painter.selection.x -= 1; break;//<
case 38: Painter.selection.y -= 1; break;//UP
case 39: Painter.selection.x += 1; break;//>
case 40: Painter.selection.y += 1; break;//DOWN
}
Painter.selection.x = Math.clamp(Painter.selection.x, 1-Painter.selection.canvas.width, UVEditor.texture.width -1)
Painter.selection.y = Math.clamp(Painter.selection.y, 1-Painter.selection.canvas.height, UVEditor.texture.height-1)
UVEditor.updatePastingOverlay();
e.preventDefault();
// Dialog
} else if (Dialog.open) {
let dialog = Dialog.open;
for (let id in (dialog.keyboard_actions || {})) {
let action = dialog.keyboard_actions[id];
if (Condition(action.condition, dialog) && action.keybind.isTriggered(e)) {
action.run.call(dialog, e);
}
}
if ($('textarea:focus').length === 0) {
if (Keybinds.extra.confirm.keybind.isTriggered(e)) {
if (input_focus) {
@ -853,6 +848,18 @@ addEventListeners(document, 'keydown mousedown', function(e) {
SharedActions.run('unselect_all', e);
used = true;
}
} else if (Toolbox.selected.id == 'copy_paste_tool' && UVEditor.texture && Painter.selection.canvas && e.which >= 37 && e.which <= 40) {
switch (e.which) {
case 37: Painter.selection.x -= 1; break;//<
case 38: Painter.selection.y -= 1; break;//UP
case 39: Painter.selection.x += 1; break;//>
case 40: Painter.selection.y += 1; break;//DOWN
}
Painter.selection.x = Math.clamp(Painter.selection.x, 1-Painter.selection.canvas.width, UVEditor.texture.width -1)
Painter.selection.y = Math.clamp(Painter.selection.y, 1-Painter.selection.canvas.height, UVEditor.texture.height-1)
UVEditor.updatePastingOverlay();
e.preventDefault();
} else if (Modes.paint && TextureLayer.selected && TextureLayer.selected.in_limbo) {
if (Keybinds.extra.confirm.keybind.isTriggered(e)) {
TextureLayer.selected.resolveLimbo(false);