Remove select() from UIScrollList, just mouse events

diff --git a/_UIFramework.pde b/_UIFramework.pde
index c2ac5055ff09052711ddbf155c8192b8375e6f32..ba5a8c8e2b8ac1cd1a10b6887fb5b24fdd2befd6 100644 (file)
--- a/_UIFramework.pde
+++ b/_UIFramework.pde
@@ -696,7 +696,6 @@ public class UIScrollList extends UIObject {
       if (scrollOffset + index < items.size()) {
         pressedItem = items.get(scrollOffset + index);
         pressedItem.onMousePressed();
-        pressedItem.select();
         redraw();
       }
     }
@@ -754,7 +753,6 @@ public interface ScrollItem {
   public boolean isSelected();
   public boolean isPending();
   public String getLabel();
-  public void select();
   public void onMousePressed();
   public void onMouseReleased();  
 }

diff --git a/_UIImplementation.pde b/_UIImplementation.pde
index 03379ce81d072740ccefc56b05c700f3cd4aa6ae..c2d073cb24d0a4d71e55817a5480504950bae0b3 100644 (file)
--- a/_UIImplementation.pde
+++ b/_UIImplementation.pde
@@ -80,7 +80,7 @@ class UIPatternDeck extends UIWindow {
       return deck.getNextPattern() == pattern;
     }
     
-    public void select() {
+    public void onMousePressed() {
       deck.goPattern(pattern);
     }
   }
@@ -126,7 +126,7 @@ class TransitionScrollItem extends AbstractScrollItem {
     return false;
   }
   
-  public void select() {
+  public void onMousePressed() {
     lx.engine.getDeck(1).setBlendTransition(transition);
   }
 }
@@ -192,10 +192,6 @@ class UIEffects extends UIWindow {
       return effect.isEnabled();
     }
     
-    public void select() {
-      glucose.setSelectedEffect(effect);
-    }
-    
     public void onMousePressed() {
       if (glucose.getSelectedEffect() == effect) {
         if (effect.isMomentary()) {
@@ -203,6 +199,8 @@ class UIEffects extends UIWindow {
         } else {
           effect.toggle();
         }
+      } else {
+        glucose.setSelectedEffect(effect);
       }
     }
     
@@ -249,7 +247,7 @@ class UIOutput extends UIWindow {
       return panda.isEnabled();
     }
     
-    public void select() {
+    public void onMousePressed() {
       panda.toggle();
     }
   }