From 283fcd9979ead78a914070fe2a5adaba0fd9b67b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 10 Jan 2020 17:15:43 +0100 Subject: [PATCH] Bug Fixed, no scale coming into de designer --- Scales/Commons.js | 2 +- Scales/TimeFrameScale.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Scales/Commons.js b/Scales/Commons.js index b4259b9c2..8871558ff 100644 --- a/Scales/Commons.js +++ b/Scales/Commons.js @@ -13,7 +13,7 @@ function drawScaleDisplay (label1, label2, label3, xExtraOffSet1, xExtraOffSet2, container: container, borderColor: UI_COLOR.RUSTED_RED, castShadow: false, - backgroundColor: UI_COLOR.DARK, + backgroundColor: UI_COLOR.BLACK, opacity: OPACITY } diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js index ed3c6c5c6..366a6edb7 100644 --- a/Scales/TimeFrameScale.js +++ b/Scales/TimeFrameScale.js @@ -123,6 +123,8 @@ function newTimeFrameScale () { /* Checking against the container limits. */ if (timePoint.x < upCorner.x) { timePoint.x = upCorner.x } if (timePoint.x + thisObject.container.frame.width > bottonCorner.x) { timePoint.x = bottonCorner.x - thisObject.container.frame.width } + if (timePoint.y < upCorner.y + thisObject.container.frame.height) { timePoint.y = upCorner.y + thisObject.container.frame.height } + if (timePoint.y > bottonCorner.y) { timePoint.y = bottonCorner.y } thisObject.container.frame.position.x = timePoint.x thisObject.container.frame.position.y = timePoint.y - thisObject.container.frame.height