From 19318dcaeb345a69102a621b8b3731c877898236 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 23 Aug 2020 16:45:34 +0200 Subject: [PATCH] Face Washing --- FloatingSpace/CircularProgressBar.js | 12 ++++++------ FloatingSpace/UiObject.js | 23 ++++++++++++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/FloatingSpace/CircularProgressBar.js b/FloatingSpace/CircularProgressBar.js index 070f55e22..afa76606d 100644 --- a/FloatingSpace/CircularProgressBar.js +++ b/FloatingSpace/CircularProgressBar.js @@ -110,7 +110,7 @@ function newCircularProgressBar() { if (canvas.floatingSpace.inMapMode === true) { return } if (needToDrawRing !== true) { return } - const VISIBLE_RADIUS = thisObject.container.frame.radius * 2 + const VISIBLE_RADIUS = thisObject.container.frame.radius * 1.5 let visiblePosition = { x: thisObject.container.frame.position.x, @@ -121,7 +121,7 @@ function newCircularProgressBar() { visiblePosition = thisObject.fitFunction(visiblePosition) for (let i = 0; i < 60; i++) { - let OPACITY = opacityCounters[i] / 1000 + let OPACITY = opacityCounters[i] / 4000 if (OPACITY === 0) { continue } @@ -133,13 +133,13 @@ function newCircularProgressBar() { browserCanvasContext.closePath() browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', ' + OPACITY * 2 + ')' - browserCanvasContext.lineWidth = 6 + opacityCounters[i] / 100 / 2 - browserCanvasContext.setLineDash([3, 4]) + browserCanvasContext.lineWidth = 6 + opacityCounters[i] / 100 / 4 + browserCanvasContext.setLineDash([1, 10]) browserCanvasContext.stroke() browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.DARK_TURQUOISE + ', ' + OPACITY + ')' - browserCanvasContext.lineWidth = 0 + opacityCounters[i] / 100 / 2 - browserCanvasContext.setLineDash([3, 4]) + browserCanvasContext.lineWidth = 0 + opacityCounters[i] / 100 / 4 + browserCanvasContext.setLineDash([2, 10]) browserCanvasContext.stroke() } } diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index b30b99d2d..0ae1fd355 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -1429,10 +1429,10 @@ function newUiObject() { position = canvas.floatingSpace.transformPointToMap(position) } - let radius = thisObject.container.frame.radius * 1.35 + let radius = thisObject.container.frame.radius * 1.00 /* Label Text */ let labelPoint - let fontSize = thisObject.payload.floatingObject.currentFontSize * 6 / 4 + let fontSize = thisObject.payload.floatingObject.currentFontSize * 8 / 7 let label if (radius > 6) { @@ -1451,7 +1451,7 @@ function newUiObject() { } if (label.length > 30) { - fontSize = fontSize / 2 + fontSize = fontSize * 2 / 3 } labelPoint = { @@ -1483,7 +1483,7 @@ function newUiObject() { position = canvas.floatingSpace.transformPointToMap(position) } - let radius = thisObject.container.frame.radius * 1.75 + let radius = thisObject.container.frame.radius * 1.30 /* Label Text */ let labelPoint let fontSize = thisObject.payload.floatingObject.currentFontSize * 6 / 4 @@ -1526,7 +1526,7 @@ function newUiObject() { position = canvas.floatingSpace.transformPointToMap(position) } - let radius = thisObject.container.frame.radius * 0.9 + let radius = thisObject.container.frame.radius * 0.8 /* Label Text */ let labelPoint let fontSize = thisObject.payload.floatingObject.currentFontSize * 6 / 4 / 2 @@ -1706,10 +1706,10 @@ function newUiObject() { browserCanvasContext.beginPath() browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS, 0, Math.PI * 2, true) browserCanvasContext.closePath() - browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.BLACK + ', 0.65)' + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.BLACK + ', 0.70)' browserCanvasContext.fill() /* Border when node is in focus */ - if (hasError !== true && nodeDefinition.isHierarchyHead !== true) { + if (hasError !== true && nodeDefinition.isHierarchyHead !== true && thisObject.circularProgressBar === undefined) { browserCanvasContext.beginPath() browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS, 0, Math.PI * 2, true) browserCanvasContext.closePath() @@ -1717,6 +1717,15 @@ function newUiObject() { browserCanvasContext.lineWidth = 3 browserCanvasContext.setLineDash([0, 0]) browserCanvasContext.stroke() + + browserCanvasContext.beginPath() + browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS - 1, 0, Math.PI * 2, true) + browserCanvasContext.closePath() + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.DARK_TURQUOISE + ', ' + 1 + ')' + browserCanvasContext.lineWidth = 2 + browserCanvasContext.setLineDash([0, 0]) + browserCanvasContext.stroke() + } }