number shorcuts improved

This commit is contained in:
Luis Fernando Molina committed 2020-03-30 20:03:37 +02:00
1 parent 7c00acc348
commit 0de6ab9214
2 files changed
+15 -10

No files matched your search

+7 -7
View File
@@ -40,7 +40,7 @@ function newCanvas () {
designSpace: undefined,
animation: undefined,
mouse: undefined,
numbersShorcuts: new Map(),
shorcutNumbers: new Map(),
initialize: initialize,
finalize: finalize
}
@@ -65,7 +65,7 @@ function newCanvas () {
try {
thisObject.chartingSpace.finalize()
thisObject.floatingSpace.finalize()
thisObject.numbersShorcuts = undefined
thisObject.shorcutNumbers = undefined
browserCanvas.removeEventListener('mousedown', onMouseDown, false)
browserCanvas.removeEventListener('mouseup', onMouseUp, false)
@@ -259,14 +259,14 @@ function newCanvas () {
if ((event.keyCode >= 48 && event.keyCode <= 57)) {
let number = event.key
if (MENU_ITEM_ON_FOCUS !== undefined) {
let menuItem = thisObject.numbersShorcuts.get(number)
let menuItem = thisObject.shorcutNumbers.get(number)
if (menuItem !== undefined) {
menuItem.numberShorcut = undefined
menuItem.shorcutNumber = undefined
}
thisObject.numbersShorcuts.set(number, MENU_ITEM_ON_FOCUS)
MENU_ITEM_ON_FOCUS.numberShorcut = number
thisObject.shorcutNumbers.set(number, MENU_ITEM_ON_FOCUS)
MENU_ITEM_ON_FOCUS.shorcutNumber = number
} else {
let menuItem = thisObject.numbersShorcuts.get(number)
let menuItem = thisObject.shorcutNumbers.get(number)
if (menuItem !== undefined) {
menuItem.internalClick()
}
+8 -3
View File
@@ -39,7 +39,7 @@ function newCircularMenuItem () {
relatedUiObject: undefined,
dontShowAtFullscreen: undefined,
isEnabled: true,
numberShorcut: undefined,
shorcutNumber: undefined,
internalClick: internalClick,
physics: physics,
invisiblePhysics: invisiblePhysics,
@@ -265,6 +265,11 @@ function newCircularMenuItem () {
}
function internalClick () {
if (thisObject.shorcutNumber !== undefined) {
let label = thisObject.payload.node.name + ' ' + labelToPrint
canvas.cockpitSpace.setStatus(label, 50, canvas.cockpitSpace.statusTypes.ALL_GOOD)
}
onMouseClick()
}
@@ -439,8 +444,8 @@ function newCircularMenuItem () {
if (thisObject.type === 'Icon & Text') {
label = labelToPrint
if (thisObject.numberShorcut !== undefined) {
label = '' + thisObject.numberShorcut + '- ' + labelToPrint
if (thisObject.shorcutNumber !== undefined) {
label = '' + thisObject.shorcutNumber + '- ' + labelToPrint
}
let labelPoint