Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert removal of hotkey from js event

Browse source
This commit is contained in:
Menithal 2017-02-18 18:22:01 +02:00
parent dcbe3c622d
commit 0df6305f90
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/system/edit.js
View file

@ -849,7 +849,6 @@ function setupModelMenus() {
Menu.addMenuItem({ Menu.addMenuItem({
menuName: "Edit", menuName: "Edit",
menuItemName: "Parent Entity to Last", menuItemName: "Parent Entity to Last",
shortcutKey: "CTRL+P",
afterItem: "Entity List...", afterItem: "Entity List...",
grouping: "Advanced" grouping: "Advanced"
}); });
@ -858,7 +857,6 @@ function setupModelMenus() {
menuName: "Edit", menuName: "Edit",
menuItemName: "Unparent Entity", menuItemName: "Unparent Entity",
afterItem: "Entity List...", afterItem: "Entity List...",
shortcutKey: "CTRL+SHIFT+P",
grouping: "Advanced" grouping: "Advanced"
}); });
Menu.addMenuItem({ Menu.addMenuItem({
@ -1374,6 +1372,12 @@ var keyReleaseEvent = function (event) {
}); });
grid.setPosition(newPosition); grid.setPosition(newPosition);
} }
} else if (event.text === 'p' && event.isControl && !event.isAutoRepeat ) {
if (event.isShifted) {
unparentSelectedEntities();
} else {
parentSelectedEntities();
}
} }
}; };
Controller.keyReleaseEvent.connect(keyReleaseEvent); Controller.keyReleaseEvent.connect(keyReleaseEvent);