UI Update

Author: 203Null

Applications/Sequencer/ClipLauncher.cpp

@@ -200,7 +200,7 @@ bool ClipLauncher::Render(Point origin)
                 else
                 {
                     // Show empty slots in dim gray when no source selected
-                    color = Color::Black;
+                    color = Color::White.Dim(32);
                 }
             }
             else if(!sequencer->sequence.ClipExists(track, clip))
@@ -220,7 +220,7 @@ bool ClipLauncher::Render(Point origin)
                 }
                 else if(sequencer->ClearActive())
                 {
-                    color = Color::Black;
+                    color = Color::White.Dim(32);
                 }
                 else
                 {

Applications/Sequencer/ControlBar.cpp

@@ -232,9 +232,12 @@ bool SequencerControlBar::HandleClearKey(KeyInfo *keyInfo)
           }
           ++it;
         }
-        sequencer->sequence.PatternClearStepEvents(pattern, step, pulsesPerStep);
+        
+        if(sequencer->sequence.PatternClearStepEvents(pattern, step, pulsesPerStep))
+        {
+          sequencer->SetMessage(SequencerMessage::CLEARED);
+        }
       }
-      sequencer->SetMessage(SequencerMessage::CLEARED);
     }
   }
   else if (keyInfo->state == RELEASED)

Applications/Sequencer/PatternPad.cpp

@@ -119,7 +119,7 @@ bool PatternPad::KeyEvent(Point xy, KeyInfo* keyInfo)
             uint16_t startTime = step * pulsesPerStep;
             uint16_t endTime = startTime + pulsesPerStep - 1;
             uint8_t channel = sequencer->sequence.GetChannel(track);
-
+            
             // Remove notes from noteActive and send noteOff
             auto it = pattern->events.lower_bound(startTime);
             while (it != pattern->events.end() && it->first <= endTime)
@@ -137,8 +137,10 @@ bool PatternPad::KeyEvent(Point xy, KeyInfo* keyInfo)
                 ++it;
             }
 
-            sequencer->sequence.PatternClearStepEvents(pattern, step, pulsesPerStep);
-            sequencer->SetMessage(SequencerMessage::CLEARED);
+            if(sequencer->sequence.PatternClearStepEvents(pattern, step, pulsesPerStep))
+            {
+                sequencer->SetMessage(SequencerMessage::CLEARED);
+            }
         }
         else if(!sequencer->noteSelected.empty())
         {
@@ -275,13 +277,10 @@ bool PatternPad::Render(Point origin)
         if((sequencer->CopyActive() && sequencer->sequence.Playing(track) == false) || sequencer->ClearActive())
         {
             // Render Base
-            if(sequencer->copySourceStep >= 0)
+            for(uint8_t step = 0; step < pattern->steps; step++)
             {
-                for(uint8_t step = 0; step < pattern->steps; step++)
-                {
-                    Point point = Point(step % width, step / width);
-                    MatrixOS::LED::SetColor(patternOrigin + point, trackColor.Dim());
-                }
+                Point point = Point(step % width, step / width);
+                MatrixOS::LED::SetColor(patternOrigin + point, sequencer->copySourceStep >= 0 ? trackColor.Dim() : Color::White.Dim(32));
             }
 
             // Render Step

Applications/Sequencer/Sequence.cpp

@@ -567,16 +567,15 @@ bool Sequence::PatternClearEventsInRange(SequencePattern* pattern, uint16_t star
         removed = true;
     }
     if (removed) { dirty = true; }
-    return true;
+    return removed;
 }
 
 bool Sequence::PatternClearStepEvents(SequencePattern* pattern, uint8_t step, uint16_t pulsesPerStep)
 {
     if (!pattern) return false;
     uint16_t startTime = step * pulsesPerStep;
     uint16_t endTime = startTime + pulsesPerStep - 1;
-    PatternClearEventsInRange(pattern, startTime, endTime);
-    return true;
+    return PatternClearEventsInRange(pattern, startTime, endTime);
 }
 
 bool Sequence::PatternCopyStepEvents(SequencePattern* pattern, uint8_t src, uint8_t dest, uint16_t pulsesPerStep)

Applications/Sequencer/TrackSelector.cpp

@@ -69,7 +69,10 @@ bool TrackSelector::Render(Point origin)
     }
     else if(sequencer->CopyActive() && sequencer->sequence.Playing() == false)
     {
-        // Render nothing because we don't allow copy in here
+        for(uint8_t i = 0; i < width; i++)
+        {
+            MatrixOS::LED::SetColor(origin + Point(i, 0), Color::White.Dim(32));
+        }
     }
     else
     {