From 2be149ee4f24fcfbe8de10b018618fd30d774b18 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 8 Jun 2019 15:20:51 +0200 Subject: [PATCH] Bug Fixes --- FloatingSpace/StrategyPart.js | 32 ++++++++++++++++-------- FloatingSpace/StrategyPartConstructor.js | 2 +- FloatingSpace/StrategyPartTitle.js | 2 +- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 2fb1b8dff..17e9b56ca 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -518,10 +518,6 @@ function newStrategyPart () { thisObject.codeEditor.drawForeground() } - drawErrorMessage() - drawText() - thisObject.partTitle.draw() - if (thisObject.codeEditor !== undefined) { if (thisObject.codeEditor.visible === false) { drawBodyAndPicture() @@ -537,6 +533,10 @@ function newStrategyPart () { thisObject.menu.drawForeground() } } + + drawErrorMessage() + drawText() + thisObject.partTitle.draw() } } @@ -641,11 +641,11 @@ function newStrategyPart () { let radius = thisObject.container.frame.radius /* Label Text */ let labelPoint - let fontSize = thisObject.payload.floatingObject.currentFontSize * 1 / 2 + let fontSize = thisObject.payload.floatingObject.currentFontSize * 3 / 4 let label if (radius > 6) { - const MAX_LABEL_LENGTH = 50 + const MAX_LABEL_LENGTH = 40 label = errorMessage @@ -656,11 +656,11 @@ function newStrategyPart () { labelPoint = { x: position.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO - 5, - y: position.y + radius * 3 / 5 + fontSize * FONT_ASPECT_RATIO + 15 + y: position.y + radius * 2 / 5 + fontSize * FONT_ASPECT_RATIO + 15 } browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY - browserCanvasContext.fillStyle = thisObject.payload.floatingObject.labelStrokeStyle + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)' browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) } } @@ -759,6 +759,17 @@ function newStrategyPart () { browserCanvasContext.fill() + if (thisObject.isOnFocus === true) { + VISIBLE_RADIUS = thisObject.container.frame.radius + browserCanvasContext.beginPath() + browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS - 2, 0, Math.PI * 2, true) + browserCanvasContext.closePath() + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.BLACK + ', 0.5)' + + browserCanvasContext.fill() + } + if (thisObject.isRunning === true) { VISIBLE_RADIUS = thisObject.container.frame.radius * 2 let OPACITY = runningCounter / 30 @@ -767,7 +778,7 @@ function newStrategyPart () { browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS, 0, Math.PI * 2, true) browserCanvasContext.closePath() - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', ' + OPACITY + ')' + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TURQUOISE + ', ' + OPACITY + ')' browserCanvasContext.lineWidth = 10 browserCanvasContext.setLineDash([4, 20]) @@ -784,7 +795,7 @@ function newStrategyPart () { browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RED + ', ' + OPACITY + ')' - browserCanvasContext.lineWidth = 20 + browserCanvasContext.lineWidth = 10 browserCanvasContext.setLineDash([4, 20]) browserCanvasContext.stroke() } @@ -863,3 +874,4 @@ function newStrategyPart () { } } } + diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index 37480e567..749cebf08 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -1685,7 +1685,7 @@ function newStrategyPartConstructor () { break } case 'Code': { - level_6() + level_5() break } default: { diff --git a/FloatingSpace/StrategyPartTitle.js b/FloatingSpace/StrategyPartTitle.js index e1fbe90be..d00a9eccd 100644 --- a/FloatingSpace/StrategyPartTitle.js +++ b/FloatingSpace/StrategyPartTitle.js @@ -288,7 +288,7 @@ function newStrategyPartTitle () { function trimTitle (title) { if (title === undefined) { return } - const MAX_LABEL_LENGTH = 35 + const MAX_LABEL_LENGTH = 30 if (title.length > MAX_LABEL_LENGTH) { title = title.substring(0, MAX_LABEL_LENGTH) + '...' }