From 025f8832d916e8561ebd16c60532be554af67e05 Mon Sep 17 00:00:00 2001 From: "5684185+vsariola@users.noreply.github.com" <5684185+vsariola@users.noreply.github.com> Date: Sat, 19 Oct 2024 00:00:29 +0300 Subject: [PATCH] fix(tracker): adding order row moved cursor incorrectly --- tracker/action.go | 2 +- tracker/gioui/order_editor.go | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tracker/action.go b/tracker/action.go index d9f3d94..97b8a36 100644 --- a/tracker/action.go +++ b/tracker/action.go @@ -336,7 +336,7 @@ func (m *Model) StopPlaying() Action { func (m *Model) AddOrderRow(before bool) Action { return Allow(func() { defer m.change("AddOrderRowAction", ScoreChange, MinorChange)() - if before { + if !before { m.d.Cursor.OrderRow++ } m.d.Cursor2.OrderRow = m.d.Cursor.OrderRow diff --git a/tracker/gioui/order_editor.go b/tracker/gioui/order_editor.go index 16af9db..79f8529 100644 --- a/tracker/gioui/order_editor.go +++ b/tracker/gioui/order_editor.go @@ -186,11 +186,7 @@ func (oe *OrderEditor) command(t *Tracker, e key.Event) { t.Model.DeleteOrderRow(false).Do() } case key.NameReturn: - if e.Modifiers.Contain(key.ModShortcut) { - oe.scrollTable.Table.MoveCursor(0, -1) - oe.scrollTable.Table.SetCursor2(oe.scrollTable.Table.Cursor()) - } - t.Model.AddOrderRow(!e.Modifiers.Contain(key.ModShortcut)).Do() + t.Model.AddOrderRow(e.Modifiers.Contain(key.ModShortcut)).Do() } if iv, err := strconv.Atoi(string(e.Name)); err == nil { t.Model.Order().SetValue(oe.scrollTable.Table.Cursor(), iv)