X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_UIFramework.pde;h=f4a0a40796fe4a3a42e5360985eb032ab76ca282;hb=6b163a98976a5f2adf9da1b7bd3297e39d6dd7bf;hp=2b3d0470b5c9420d44199392aeab00b9f3892e80;hpb=9692dc7b2916817381bae28bf81abc50ef6d8bfa;p=SugarCubes.git

diff --git a/_UIFramework.pde b/_UIFramework.pde
index 2b3d047..f4a0a40 100644
--- a/_UIFramework.pde
+++ b/_UIFramework.pde
@@ -703,7 +703,7 @@ public class UIScrollList extends UIObject {
         itemColor = #707070;
       }
       float factor = even ? .92 : 1.08;
-      itemColor = color(hue(itemColor), saturation(itemColor), min(100, factor*brightness(itemColor)));
+      itemColor = lx.scaleBrightness(itemColor, factor);
       
       pg.noStroke();
       pg.fill(itemColor);
@@ -718,7 +718,7 @@ public class UIScrollList extends UIObject {
     }
     if (hasScroll) {
       pg.noStroke();
-      pg.fill(color(0, 0, 100, 15));
+      pg.fill(0x26ffffff);
       pg.rect(w-12, 0, 12, h);
       pg.fill(#333333);
       pg.rect(w-12, scrollYStart, 12, scrollYHeight);
@@ -778,7 +778,7 @@ public class UIScrollList extends UIObject {
   }
   
   public void setScrollOffset(int offset) {
-    scrollOffset = constrain(offset, 0, items.size() - numVisibleItems);
+    scrollOffset = constrain(offset, 0, max(0, items.size() - numVisibleItems));
     scrollYStart = round(scrollOffset * h / items.size());
     scrollYHeight = round(numVisibleItems * h / items.size());
     redraw();