movement - e (#145)

* rename FocusCursor() and add CursorAlignGrid() * add movement - e
wang-edward · Jan 4, 2025 · 963e915 · 963e915
1 parent 02a4cde
commit 963e915
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/include/core/timeline.hh b/include/core/timeline.hh
@@ -83,7 +83,8 @@ struct Timeline
     Timeline();
     ~Timeline();
 
-    void FocusCursor();
+    void CursorFocus();
+    void CursorAlignGrid();
 
     void Render(Interface &interface);
     void HandleEvent(const Event &event);

diff --git a/src/core/timeline.cc b/src/core/timeline.cc
@@ -277,7 +277,7 @@ void Timeline::print_timeline()
     }
 }
 
-void Timeline::FocusCursor()
+void Timeline::CursorFocus()
 {
     assert(cursor_.len < frame_.Width());
     if (cursor_.LeftEdge() < frame_.LeftEdge())
@@ -292,6 +292,11 @@ void Timeline::FocusCursor()
     }
 }
 
+void Timeline::CursorAlignGrid()
+{
+    cursor_.start = std::floor(cursor_.start / bar_width_) * bar_width_;
+}
+
 void Timeline::HandleEvent(const Event &event)
 {
     switch (screen_state_)
@@ -308,12 +313,12 @@ void Timeline::HandleEvent(const Event &event)
             case KEY_H:
                 cursor_.start -= step_size_;
                 LOG_VAR(cursor_.LeftEdge() < frame_.LeftEdge());
-                FocusCursor();
+                CursorFocus();
                 break;
             case KEY_L:
                 cursor_.start += step_size_;
                 LOG_VAR(cursor_.RightEdge() > frame_.RightEdge());
-                FocusCursor();
+                CursorFocus();
                 break;
             case KEY_J:
                 if (!APP->edit_.getTransport().isRecording())
@@ -362,7 +367,29 @@ void Timeline::HandleEvent(const Event &event)
                     if (auto clip = dynamic_cast<te::Clip *>(item))
                     {
                         cursor_.start = clip->getStartBeat().inBeats();
-                        FocusCursor();
+                        CursorFocus();
+                        CursorAlignGrid();
+                    }
+                }
+            }
+            break;
+            case KEY_E:
+            {
+                const te::TempoSequence &tempo = APP->edit_.tempoSequence;
+                auto pos = tempo.toTime(te::BeatPosition::fromBeats(cursor_.RightEdge()));
+
+                te::TrackItem *item = APP->CurrTrack().base_.getNextTrackItemAt(pos);
+                if (item == nullptr)
+                {
+                    LOG_MSG("KEY_E found NONE");
+                }
+                else
+                {
+                    if (auto clip = dynamic_cast<te::Clip *>(item))
+                    {
+                        cursor_.start = clip->getEndBeat().inBeats();
+                        CursorFocus();
+                        CursorAlignGrid();
                     }
                 }
             }