fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2698 from Smidy13/develop

Browse Source 
Improvement: Scrollbar for ListSelector
This commit is contained in:
Luis Fernando Molina authored and GitHub committed 2021-11-22 22:01:14 -04:00
2 parents 1433c04dfb f8bb5e55dc
commit a9e4c5a7fc
1 file changed
+42 -11
Download Patch File Download Diff File Expand all files Collapse all files
Projects/Foundations/UI/Spaces/Floating-Space/ListSelector.js
+42 -11
View File
@@ -280,6 +280,7 @@ function newListSelector() {
let fontSize
let fontColor
let opacity
let offset = thisObject.container.frame.radius / ( 8 / 5 )
for (let i = 0; i < VISIBLE_LABELS; i++) {
@@ -298,9 +299,6 @@ function newListSelector() {
label = optionsList[index].name
subLabel = path.join("->")
if (label.length > 65) { label = label.substring(0,65) + " (cont...)" }
if (subLabel.length > 65) { subLabel = subLabel.substring(0,65) + " (cont...)" }
if (optionsList[index].payload.uiObject.icon !== undefined) {
icon = optionsList[index].payload.uiObject.icon
}
@@ -309,11 +307,15 @@ function newListSelector() {
label = optionsList[index]
}
}
// Reduce Labels if too long
if (label.length > 35) { label = label.substring(0,35) + " (cont...)" }
if (subLabel.length > 60) { subLabel = subLabel.substring(0,60) + " (cont...)" }
fontColor = UI_COLOR.BLACK
fontSize = FONT_SIZE
opacity = 1
let offset = thisObject.container.frame.radius / ( 8 / 5 )
let listSquare = offset * 2
let rowOffset = listSquare * ( i / VISIBLE_LABELS )
let rowHeight = listSquare / VISIBLE_LABELS
@@ -347,18 +349,47 @@ function newListSelector() {
let evenOffset = 0
let subOffset = 0
if (VISIBLE_LABELS % 2 === 0) {
evenOffset = rowHeight / 2
}
if (subLabel !== '') {
subOffset = 10
}
if (VISIBLE_LABELS % 2 === 0) { evenOffset = rowHeight / 2 }
if (subLabel !== '') { subOffset = 10 }
UI.projects.foundations.utilities.drawPrint.drawIcon(icon, 1 / 2, 1 / 2, - offset + SIZE, (i - middleValue) * rowHeight + evenOffset, SIZE, thisObject.container)
UI.projects.foundations.utilities.drawPrint.drawLabel(label, 1 / 2, 1 / 2, 0, (SIZE - fontSize) / 2 + (i - middleValue) * rowHeight + evenOffset - subOffset, fontSize, thisObject.container, fontColor, undefined, undefined, opacity)
UI.projects.foundations.utilities.drawPrint.drawLabel(subLabel, 1 / 2, 1 / 2, 0, (SIZE - fontSize) / 2 + (i - middleValue) * rowHeight + evenOffset + subOffset, fontSize / 2, thisObject.container, fontColor, undefined, undefined, opacity)
}
if (optionsList.length > VISIBLE_LABELS) {
let scrollbarPosition = {
x: thisObject.container.frame.radius,
y: thisObject.container.frame.radius
}
scrollbarPosition = thisObject.container.frame.frameThisPoint(scrollbarPosition)
// Scrollbar Background
browserCanvasContext.beginPath()
browserCanvasContext.moveTo(scrollbarPosition.x + offset + 5, scrollbarPosition.y - offset);
browserCanvasContext.lineTo(scrollbarPosition.x + offset + 20, scrollbarPosition.y - offset);
browserCanvasContext.lineTo(scrollbarPosition.x + offset + 20, scrollbarPosition.y + offset);
browserCanvasContext.lineTo(scrollbarPosition.x + offset + 5, scrollbarPosition.y + offset);
browserCanvasContext.closePath()
browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.GREY + ', ' + 1 + ')'
browserCanvasContext.fill();
// Scrollbar Foreground
let scrollbarHeight = offset * 2 / (optionsList.length - VISIBLE_LABELS)
if (scrollbarHeight < 25) { scrollbarHeight = 25 }
let scrollbarOffset = ((offset * 2 - scrollbarHeight) / (optionsList.length - VISIBLE_LABELS)) * selected
browserCanvasContext.beginPath()
browserCanvasContext.moveTo(scrollbarPosition.x + offset + 7, scrollbarPosition.y - offset + 2 + scrollbarOffset);
browserCanvasContext.lineTo(scrollbarPosition.x + offset + 18, scrollbarPosition.y - offset + 2 + scrollbarOffset);
browserCanvasContext.lineTo(scrollbarPosition.x + offset + 18, scrollbarPosition.y - offset + scrollbarHeight - 2 + scrollbarOffset);
browserCanvasContext.lineTo(scrollbarPosition.x + offset + 7, scrollbarPosition.y - offset + scrollbarHeight - 2 + scrollbarOffset);
browserCanvasContext.closePath()
browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.LIGHT_GREY + ', ' + 1 + ')'
browserCanvasContext.fill();
}
}
}
}