Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix OSX shortcut inconsistencies

Browse source
This commit is contained in:
Thijs Wenker 2018-11-14 19:28:57 +01:00
parent 2c715bf592
commit cd12dd8f6d
4 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/system/edit.js
View file

@ -2722,23 +2722,23 @@ keyUpEventFromUIWindow = function(keyUpEvent) {
focusKey(pressedValue); focusKey(pressedValue);
} else if (keyUpEvent.keyCodeString === "G") { } else if (keyUpEvent.keyCodeString === "G") {
gridKey(pressedValue); gridKey(pressedValue);
} else if (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "X") { } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "X") {
selectionManager.cutSelectedEntities(); selectionManager.cutSelectedEntities();
} else if (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "C") { } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "C") {
selectionManager.copySelectedEntities(); selectionManager.copySelectedEntities();
} else if (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "V") { } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "V") {
selectionManager.pasteEntities(); selectionManager.pasteEntities();
} else if (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "D") { } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "D") {
selectionManager.duplicateSelection(); selectionManager.duplicateSelection();
} else if (keyUpEvent.ctrlKey && !keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "Z") { } else if (keyUpEvent.controlKey && !keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "Z") {
undoHistory.undo(); undoHistory.undo();
} else if (keyUpEvent.ctrlKey && !keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "P") { } else if (keyUpEvent.controlKey && !keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "P") {
parentSelectedEntities(); parentSelectedEntities();
} else if (keyUpEvent.ctrlKey && keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "P") { } else if (keyUpEvent.controlKey && keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "P") {
unparentSelectedEntities(); unparentSelectedEntities();
} else if ( } else if (
(keyUpEvent.ctrlKey && keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "Z") || (keyUpEvent.controlKey && keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "Z") ||
(keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "Y")) { (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "Y")) {
undoHistory.redo(); undoHistory.redo();
} else if (WANT_DEBUG_MISSING_SHORTCUTS) { } else if (WANT_DEBUG_MISSING_SHORTCUTS) {

10
scripts/system/html/js/entityList.js
View file

@ -1123,7 +1123,9 @@ function loaded() {
return; return;
} }
let {code, key, keyCode, altKey, ctrlKey, shiftKey} = keyUpEvent; let {code, key, keyCode, altKey, ctrlKey, metaKey, shiftKey} = keyUpEvent;
let controlKey = window.navigator.platform.startsWith("Mac") ? metaKey : ctrlKey;
let keyCodeString; let keyCodeString;
switch (keyCode) { switch (keyCode) {
@ -1138,7 +1140,7 @@ function loaded() {
break; break;
} }
if (ctrlKey && keyCodeString === "A") { if (controlKey && keyCodeString === "A") {
let visibleEntityIDs = visibleEntities.map(visibleEntity => visibleEntity.id); let visibleEntityIDs = visibleEntities.map(visibleEntity => visibleEntity.id);
let selectionIncludesAllVisibleEntityIDs = visibleEntityIDs.every(visibleEntityID => { let selectionIncludesAllVisibleEntityIDs = visibleEntityIDs.every(visibleEntityID => {
return selectedEntities.includes(visibleEntityID); return selectedEntities.includes(visibleEntityID);
@ -1170,8 +1172,8 @@ function loaded() {
keyCode, keyCode,
keyCodeString, keyCodeString,
altKey, altKey,
ctrlKey, controlKey,
shiftKey shiftKey,
} }
})); }));
}, false); }, false);

8
scripts/system/html/js/entityProperties.js
View file

@ -3502,7 +3502,9 @@ function loaded() {
if (keyUpEvent.target.nodeName === "INPUT") { if (keyUpEvent.target.nodeName === "INPUT") {
return; return;
} }
let {code, key, keyCode, altKey, ctrlKey, shiftKey} = keyUpEvent; let {code, key, keyCode, altKey, ctrlKey, metaKey, shiftKey} = keyUpEvent;
let controlKey = window.navigator.platform.startsWith("Mac") ? metaKey : ctrlKey;
let keyCodeString; let keyCodeString;
switch (keyCode) { switch (keyCode) {
@ -3525,8 +3527,8 @@ function loaded() {
keyCode, keyCode,
keyCodeString, keyCodeString,
altKey, altKey,
ctrlKey, controlKey,
shiftKey shiftKey,
} }
})); }));
}, false); }, false);

8
scripts/system/html/js/gridControls.js
View file

@ -139,7 +139,9 @@ function loaded() {
if (keyUpEvent.target.nodeName === "INPUT") { if (keyUpEvent.target.nodeName === "INPUT") {
return; return;
} }
let {code, key, keyCode, altKey, ctrlKey, shiftKey} = keyUpEvent; let {code, key, keyCode, altKey, ctrlKey, metaKey, shiftKey} = keyUpEvent;
let controlKey = window.navigator.platform.startsWith("Mac") ? metaKey : ctrlKey;
let keyCodeString; let keyCodeString;
switch (keyCode) { switch (keyCode) {
@ -162,8 +164,8 @@ function loaded() {
keyCode, keyCode,
keyCodeString, keyCodeString,
altKey, altKey,
ctrlKey, controlKey,
shiftKey shiftKey,
} }
})); }));
}, false); }, false);