From b7b22955fa1d137cbf3977102a3a31341a37e454 Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Fri, 19 Oct 2018 12:09:17 -0300 Subject: [PATCH] Change to single bottom bar --- BottomSpace/DeleteTradingHistory.js | 2 +- BottomSpace/PlayStopButton.js | 2 +- Globals.js | 2 +- Spaces/TopSpace.js | 4 ++-- TopSpace/CurrentBot.js | 7 +++---- TopSpace/CurrentProcess.js | 6 +++--- TopSpace/CurrentStartMode.js | 6 +++--- TopSpace/DevTeam.js | 6 +++--- TopSpace/EndUser.js | 2 +- TopSpace/Login.js | 2 +- 10 files changed, 19 insertions(+), 20 deletions(-) diff --git a/BottomSpace/DeleteTradingHistory.js b/BottomSpace/DeleteTradingHistory.js index 11df08eee..e6ec098e8 100644 --- a/BottomSpace/DeleteTradingHistory.js +++ b/BottomSpace/DeleteTradingHistory.js @@ -296,7 +296,7 @@ function newDeleteTradingHistory() { if (canDrawIcon === false) { return; } - let breakpointsHeight = 15; + let breakpointsHeight = 14; let imageHeight = 15; let imageWidth = 15; diff --git a/BottomSpace/PlayStopButton.js b/BottomSpace/PlayStopButton.js index 558633a2c..1233cd3fb 100644 --- a/BottomSpace/PlayStopButton.js +++ b/BottomSpace/PlayStopButton.js @@ -130,7 +130,7 @@ function newPlayStopButton() { thisObject.container.frame.draw(false, false); - let breakpointsHeight = 15; + let breakpointsHeight = 8; if (canDraw === false) { return; } diff --git a/Globals.js b/Globals.js index f2e3e324a..23d66d5af 100644 --- a/Globals.js +++ b/Globals.js @@ -130,7 +130,7 @@ const _1_MINUTE_IN_MILISECONDS = 1 * 60 * 1000; const EARLIEST_DATE = new Date(2014, 0, 18, 4, 26, 8); const TOP_SPACE_HEIGHT = 50; -const BOTTOM_SPACE_HEIGHT = 50; +const BOTTOM_SPACE_HEIGHT = 35; const PRODUCT_CARD_STATUS = { diff --git a/Spaces/TopSpace.js b/Spaces/TopSpace.js index 3cfb99be8..9bb939b47 100644 --- a/Spaces/TopSpace.js +++ b/Spaces/TopSpace.js @@ -23,7 +23,7 @@ function newTopSpace() { thisObject.container.frame.height = TOP_SPACE_HEIGHT; container.frame.position.x = 0; - container.frame.position.y = 0; + container.frame.position.y = viewPort.visibleArea.bottomLeft.y; container.isDraggeable = false; @@ -97,7 +97,7 @@ function newTopSpace() { thisObject.container.frame.draw(false, false); - drawBackground(); + //drawBackground(); thisObject.companyLogo.draw(); thisObject.endUser.draw(); thisObject.devTeam.draw(); diff --git a/TopSpace/CurrentBot.js b/TopSpace/CurrentBot.js index 50e947b52..34ca61f2b 100644 --- a/TopSpace/CurrentBot.js +++ b/TopSpace/CurrentBot.js @@ -16,7 +16,7 @@ function newCurrentBot() { thisObject.container.frame.height = TOP_SPACE_HEIGHT; container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 3; - container.frame.position.y = 0; + container.frame.position.y = viewPort.visibleArea.bottomLeft.y; container.isDraggeable = false; container.isClickeable = true; @@ -121,10 +121,9 @@ function newCurrentBot() { if (label === undefined) { label = "" }; let point = { - x: thisObject.container.frame.width * 1 / 3, - y: (thisObject.container.frame.height / 2) + 4 + x: 250, + y: (thisObject.container.frame.height / 2) + 12 }; - point = thisObject.container.frame.frameThisPoint(point); browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY; diff --git a/TopSpace/CurrentProcess.js b/TopSpace/CurrentProcess.js index 01dccc4d5..fa88e0cc9 100644 --- a/TopSpace/CurrentProcess.js +++ b/TopSpace/CurrentProcess.js @@ -12,11 +12,11 @@ function newCurrentProcess() { container.initialize(); thisObject.container = container; - thisObject.container.frame.width = 200; + thisObject.container.frame.width = 130; thisObject.container.frame.height = TOP_SPACE_HEIGHT; container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 2; - container.frame.position.y = 0; + container.frame.position.y = viewPort.visibleArea.bottomLeft.y; container.isDraggeable = false; container.isClickeable = true; @@ -115,7 +115,7 @@ function newCurrentProcess() { let point = { x: thisObject.container.frame.width * 1 / 3, - y: (thisObject.container.frame.height / 2) + 4 + y: (thisObject.container.frame.height / 2) + 12 }; point = thisObject.container.frame.frameThisPoint(point); diff --git a/TopSpace/CurrentStartMode.js b/TopSpace/CurrentStartMode.js index a3cd77eeb..3fe0c9c22 100644 --- a/TopSpace/CurrentStartMode.js +++ b/TopSpace/CurrentStartMode.js @@ -12,11 +12,11 @@ function newCurrentStartMode() { container.initialize(); thisObject.container = container; - thisObject.container.frame.width = 200; + thisObject.container.frame.width = 130; thisObject.container.frame.height = TOP_SPACE_HEIGHT; container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 1; - container.frame.position.y = 0; + container.frame.position.y = viewPort.visibleArea.bottomLeft.y; container.isDraggeable = false; container.isClickeable = true; @@ -87,7 +87,7 @@ function newCurrentStartMode() { let point = { x: thisObject.container.frame.width / 2 - label.length / 2 * fontSize / 3, - y: (thisObject.container.frame.height / 2) + 4 + y: (thisObject.container.frame.height / 2) + 12 }; point = thisObject.container.frame.frameThisPoint(point); diff --git a/TopSpace/DevTeam.js b/TopSpace/DevTeam.js index afad5e4f1..7e87bd6ae 100644 --- a/TopSpace/DevTeam.js +++ b/TopSpace/DevTeam.js @@ -16,7 +16,7 @@ function newDevTeam() { thisObject.container.frame.height = TOP_SPACE_HEIGHT; container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 4; - container.frame.position.y = 0; + container.frame.position.y = viewPort.visibleArea.bottomLeft.y; container.isDraggeable = false; container.isClickeable = true; @@ -104,8 +104,8 @@ function newDevTeam() { let fontSize = 12; let point = { - x: thisObject.container.frame.width * 1 / 3, - y: (thisObject.container.frame.height / 2) + 4 + x: 300, + y: (thisObject.container.frame.height / 2) + 12 }; point = thisObject.container.frame.frameThisPoint(point); diff --git a/TopSpace/EndUser.js b/TopSpace/EndUser.js index 5fd82d1a4..c9a25631c 100644 --- a/TopSpace/EndUser.js +++ b/TopSpace/EndUser.js @@ -16,7 +16,7 @@ function newEndUser() { thisObject.container.frame.height = TOP_SPACE_HEIGHT; container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 5; - container.frame.position.y = 0; + container.frame.position.y = viewPort.visibleArea.bottomLeft.y; container.isDraggeable = false; diff --git a/TopSpace/Login.js b/TopSpace/Login.js index 9b95e105e..9067f46ac 100644 --- a/TopSpace/Login.js +++ b/TopSpace/Login.js @@ -16,7 +16,7 @@ function newLogin() { thisObject.container.frame.height = TOP_SPACE_HEIGHT; container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 1; - container.frame.position.y = 0; + container.frame.position.y = viewPort.visibleArea.bottomLeft.y; container.isDraggeable = false; container.isClickeable = true;