From d4185f123579e3217365beac9c5d5adf4026ced2 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 15 Jan 2020 23:12:23 +0100 Subject: [PATCH] Rolling Up and Down --- Panels/LayersPanel.js | 17 ++++++++++++++--- Scales/Commons.js | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Panels/LayersPanel.js b/Panels/LayersPanel.js index 0c629f7d9..46c2fc459 100644 --- a/Panels/LayersPanel.js +++ b/Panels/LayersPanel.js @@ -122,8 +122,14 @@ function newProductsPanel () { delta = 1 } - firstVisibleLayer = firstVisibleLayer + delta - + if (event.y - thisObject.container.frame.position.y - CURRENT_TOP_MARGIN < heatherHeight) { + desiredVisibleLayers = desiredVisibleLayers + delta + if (desiredVisibleLayers < 0) { desiredVisibleLayers = 0 } + if (desiredVisibleLayers > thisObject.layers.length) { desiredVisibleLayers = thisObject.layers.length } + } else { + firstVisibleLayer = firstVisibleLayer + delta + } + desiredPanelHeight = (layerHeight + LAYER_SEPARATION) * desiredVisibleLayers + heatherHeight + footerHeight calculateVisbleLayers() } @@ -136,7 +142,12 @@ function newProductsPanel () { } if (thisObject.layers.length < posibleVisibleLayers) { posibleVisibleLayers = thisObject.layers.length } - posiblePanelHeight = (layerHeight + LAYER_SEPARATION) * posibleVisibleLayers + heatherHeight + footerHeight + if (posibleVisibleLayers === 0) { + posiblePanelHeight = (layerHeight + LAYER_SEPARATION) * posibleVisibleLayers + heatherHeight + } else { + posiblePanelHeight = (layerHeight + LAYER_SEPARATION) * posibleVisibleLayers + heatherHeight + footerHeight + } + thisObject.container.frame.height = posiblePanelHeight } diff --git a/Scales/Commons.js b/Scales/Commons.js index 9c6ad4a26..0e5bce110 100644 --- a/Scales/Commons.js +++ b/Scales/Commons.js @@ -37,7 +37,7 @@ function drawScaleDisplayCover (container) { borderColor: UI_COLOR.WHITE, castShadow: false, backgroundColor: UI_COLOR.WHITE, - opacity: '0.75' + opacity: '0.50' } roundedCornersBackground(params)