diff --git a/FloatingSpace/Picker.js b/FloatingSpace/Picker.js index 1d3d0d15d..47e3246b9 100644 --- a/FloatingSpace/Picker.js +++ b/FloatingSpace/Picker.js @@ -25,7 +25,7 @@ function newPicker () { thisObject.container.frame.position.x = 0 thisObject.container.frame.position.y = 0 thisObject.container.frame.width = 250 - thisObject.container.frame.height = 150 + thisObject.container.frame.height = 120 let optionsList let parent @@ -150,10 +150,11 @@ function newPicker () { } function drawForeground () { - const FONT_SIZE = 25 + const FONT_SIZE = 22 const VISIBLE_LABELS = 5 let fontSize let fontColor + let opacity for (let i = 0; i < VISIBLE_LABELS; i++) { let index = i - 2 + selected @@ -163,19 +164,29 @@ function newPicker () { } fontColor = UI_COLOR.LIGHT_GREY switch (i) { - case 0: fontSize = FONT_SIZE - 15 + case 0: + fontSize = FONT_SIZE - 12 + opacity = 0.4 break - case 1: fontSize = FONT_SIZE - 8 + case 1: + fontSize = FONT_SIZE - 8 + opacity = 0.5 break - case 2: fontSize = FONT_SIZE - 0 + case 2: + fontSize = FONT_SIZE - 0 fontColor = UI_COLOR.BLACK + opacity = 1 break - case 3: fontSize = FONT_SIZE - 8 + case 3: + fontSize = FONT_SIZE - 8 + opacity = 0.5 break - case 4: fontSize = FONT_SIZE - 15 + case 4: + fontSize = FONT_SIZE - 12 + opacity = 0.4 break } - drawLabel(label, 1 / 2, i / VISIBLE_LABELS, 0, 0, fontSize, thisObject.container, fontColor, undefined, undefined) + drawLabel(label, 1 / 2, i / VISIBLE_LABELS, 0, 0, fontSize, thisObject.container, fontColor, undefined, undefined, opacity) } } } diff --git a/Utilities/RoundedCornersBackground.js b/Utilities/RoundedCornersBackground.js index e21100bf3..825400009 100644 --- a/Utilities/RoundedCornersBackground.js +++ b/Utilities/RoundedCornersBackground.js @@ -105,10 +105,11 @@ function roundedCornersBackground (params) { browserCanvasContext.stroke() } -function drawLabel (label, xFactor, yFactor, xOffset, yOffset, fontSize, container, fontColor, noFrameX, noFrameY) { +function drawLabel (label, xFactor, yFactor, xOffset, yOffset, fontSize, container, fontColor, noFrameX, noFrameY, opacity) { if (label === undefined) { return } if (fontColor === undefined) { fontColor = UI_COLOR.WHITE } let fontOffset = label.length * fontSize * FONT_ASPECT_RATIO + 10 + if (opacity === undefined) { opacity = 1 } let labelPoint = { x: container.frame.width * xFactor + xOffset - fontOffset / 2, @@ -126,7 +127,7 @@ function drawLabel (label, xFactor, yFactor, xOffset, yOffset, fontSize, contain } browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY - browserCanvasContext.fillStyle = 'rgba(' + fontColor + ', 1)' + browserCanvasContext.fillStyle = 'rgba(' + fontColor + ', ' + opacity + ')' browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) }