Some cleanups and listen to deck for transition changes

[SugarCubes.git] / _UIFramework.pde

diff --git a/_UIFramework.pde b/_UIFramework.pde
index a2946fbad9af7f7da96d6c7d9bbd66a287e3c541..ba5a8c8e2b8ac1cd1a10b6887fb5b24fdd2befd6 100644 (file)
--- a/_UIFramework.pde
+++ b/_UIFramework.pde
@@ -655,8 +655,11 @@ public class UIScrollList extends UIObject {
         itemColor = pendingColor;
       } else {
         labelColor = #000000;
-        itemColor = even ? #666666 : #777777;
+        itemColor = #707070;
       }
+      float factor = even ? .92 : 1.08;
+      itemColor = color(hue(itemColor), saturation(itemColor), min(100, factor*brightness(itemColor)));
+      
       pg.noStroke();
       pg.fill(itemColor);
       pg.rect(0, yp, w, itemHeight);
@@ -693,7 +696,6 @@ public class UIScrollList extends UIObject {
       if (scrollOffset + index < items.size()) {
         pressedItem = items.get(scrollOffset + index);
         pressedItem.onMousePressed();
-        pressedItem.select();
         redraw();
       }
     }
@@ -751,7 +753,6 @@ public interface ScrollItem {
   public boolean isSelected();
   public boolean isPending();
   public String getLabel();
-  public void select();
   public void onMousePressed();
   public void onMouseReleased();  
 }
@@ -783,7 +784,7 @@ public class UIIntegerBox extends UIObject {
   }
   
   protected void onDraw(PGraphics pg) {
-    pg.stroke(#999999);
+    pg.stroke(#666666);
     pg.fill(#222222);
     pg.rect(0, 0, w, h);
     pg.textAlign(CENTER, CENTER);