diff --git a/FloatingSpace/CircularMenuItem.js b/FloatingSpace/CircularMenuItem.js index 71da46801..ccda72ca8 100644 --- a/FloatingSpace/CircularMenuItem.js +++ b/FloatingSpace/CircularMenuItem.js @@ -110,7 +110,7 @@ function newCircularMenuItem () { selfMouseNotOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseNotOver', onMouseNotOver) if (thisObject.type === 'Icon & Text') { - thisObject.container.frame.width = 185 + thisObject.container.frame.width = 150 } else { thisObject.container.frame.width = 50 } diff --git a/FloatingSpace/ConfigEditor.js b/FloatingSpace/ConfigEditor.js index 17fbd8818..5ce7398bc 100644 --- a/FloatingSpace/ConfigEditor.js +++ b/FloatingSpace/ConfigEditor.js @@ -135,8 +135,8 @@ function newConfigEditor () { thisObject.container.frame.position.x = 0 thisObject.container.frame.position.y = 0 - thisObject.container.frame.width = thisObject.container.frame.radius * 1.8 * 2 - thisObject.container.frame.height = thisObject.container.frame.radius * 1 * 2 + thisObject.container.frame.width = thisObject.container.frame.radius * 1.8 + thisObject.container.frame.height = thisObject.container.frame.radius * 1 let textAreaPosition = { x: 0 - thisObject.container.frame.width / 2, @@ -168,7 +168,7 @@ function newConfigEditor () { position = thisObject.container.frame.frameThisPoint(position) - let radius = thisObject.container.frame.radius * 2 + let radius = thisObject.container.frame.radius if (radius > 0.5) { browserCanvasContext.beginPath() diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 37e832461..d59f9fdc9 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -189,8 +189,33 @@ function newUiObject () { if (container !== undefined) { return container } } - container = thisObject.uiObjectTitle.getContainer(point) - if (container !== undefined) { return container } + let getitle = true + + if (thisObject.codeEditor !== undefined) { + if (thisObject.codeEditor.visible === true) { + getitle = false + } + } + if (thisObject.configEditor !== undefined) { + if (thisObject.configEditor.visible === true) { + getitle = false + } + } + if (thisObject.conditionEditor !== undefined) { + if (thisObject.conditionEditor.visible === true) { + getitle = false + } + } + if (thisObject.formulaEditor !== undefined) { + if (thisObject.formulaEditor.visible === true) { + getitle = false + } + } + + if (getitle === true) { + container = thisObject.uiObjectTitle.getContainer(point) + if (container !== undefined) { return container } + } container = thisObject.menu.getContainer(point) if (container !== undefined) { return container } @@ -811,25 +836,30 @@ function newUiObject () { } let drawMenu = true + let drawTitle = true if (thisObject.codeEditor !== undefined) { if (thisObject.codeEditor.visible === true) { drawMenu = false + drawTitle = false } } if (thisObject.configEditor !== undefined) { if (thisObject.configEditor.visible === true) { drawMenu = false + drawTitle = false } } if (thisObject.conditionEditor !== undefined) { if (thisObject.conditionEditor.visible === true) { drawMenu = false + drawTitle = false } } if (thisObject.formulaEditor !== undefined) { if (thisObject.formulaEditor.visible === true) { drawMenu = false + drawTitle = false } } @@ -844,7 +874,10 @@ function newUiObject () { drawErrorMessage() drawValue() drawText() - thisObject.uiObjectTitle.draw() + + if (drawTitle === true) { + thisObject.uiObjectTitle.draw() + } } }