repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
[SugarCubes.git]
/
_UIFramework.pde
diff --git
a/_UIFramework.pde
b/_UIFramework.pde
index 2b3d0470b5c9420d44199392aeab00b9f3892e80..f4a0a40796fe4a3a42e5360985eb032ab76ca282 100644
(file)
--- a/
_UIFramework.pde
+++ b/
_UIFramework.pde
@@
-703,7
+703,7
@@
public class UIScrollList extends UIObject {
itemColor = #707070;
}
float factor = even ? .92 : 1.08;
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);
pg.noStroke();
pg.fill(itemColor);
@@
-718,7
+718,7
@@
public class UIScrollList extends UIObject {
}
if (hasScroll) {
pg.noStroke();
}
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);
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) {
}
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();
scrollYStart = round(scrollOffset * h / items.size());
scrollYHeight = round(numVisibleItems * h / items.size());
redraw();