mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-25 17:52:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix arrow key movement in results list

Browse Source
This commit is contained in:
Kovid Goyal
2025-06-30 15:18:45 +05:30
parent 51a265fbb9
commit 3fbaabe334
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kittens/choose_files/main.go
View File

@@ -92,7 +92,7 @@ func (m Mode) WindowTitle() string {
} }
type render_state struct { type render_state struct {
num_matches, num_of_slots, num_before int num_matches, num_of_slots, num_before, num_per_column, num_columns int
} }
type State struct { type State struct {

14
kittens/choose_files/results.go
View File

@@ -165,6 +165,8 @@ func (h *Handler) draw_list_of_results(matches *SortedResults, y, height int) in
} }
columns, num_before := matches.SplitIntoColumns(calc_num_cols, height, h.state.last_render.num_before, h.state.CurrentIndex()) columns, num_before := matches.SplitIntoColumns(calc_num_cols, height, h.state.last_render.num_before, h.state.CurrentIndex())
h.state.last_render.num_before = num_before h.state.last_render.num_before = num_before
h.state.last_render.num_per_column = height
h.state.last_render.num_columns = num_cols
x := 1 x := 1
for _, col := range columns { for _, col := range columns {
h.lp.MoveCursorTo(x, y) h.lp.MoveCursorTo(x, y)
@@ -225,22 +227,30 @@ func (h *Handler) next_result(amt int) {
idx := h.state.CurrentIndex() idx := h.state.CurrentIndex()
idx = h.result_manager.scorer.sorted_results.IncrementIndexWithWrapAround(idx, amt) idx = h.result_manager.scorer.sorted_results.IncrementIndexWithWrapAround(idx, amt)
h.state.SetCurrentIndex(idx) h.state.SetCurrentIndex(idx)
h.state.last_render.num_before = max(0, h.state.last_render.num_before+amt)
} }
} }
func (h *Handler) move_sideways(leftwards bool) { func (h *Handler) move_sideways(leftwards bool) {
if h.state.last_render.num_matches > 0 { r := h.state.last_render
if r.num_matches > 0 && r.num_per_column > 0 {
cidx := h.state.CurrentIndex() cidx := h.state.CurrentIndex()
slots := h.state.last_render.num_of_slots slots := r.num_of_slots
if leftwards { if leftwards {
idx := h.result_manager.scorer.sorted_results.IncrementIndexWithWrapAround(cidx, -slots) idx := h.result_manager.scorer.sorted_results.IncrementIndexWithWrapAround(cidx, -slots)
if idx.Less(cidx) { if idx.Less(cidx) {
h.state.SetCurrentIndex(idx) h.state.SetCurrentIndex(idx)
if r.num_columns > 1 && r.num_before >= r.num_per_column {
h.state.last_render.num_before = max(0, h.state.last_render.num_before-slots)
}
} }
} else { } else {
idx := h.result_manager.scorer.sorted_results.IncrementIndexWithWrapAround(cidx, slots) idx := h.result_manager.scorer.sorted_results.IncrementIndexWithWrapAround(cidx, slots)
if cidx.Less(idx) { if cidx.Less(idx) {
h.state.SetCurrentIndex(idx) h.state.SetCurrentIndex(idx)
if r.num_columns > 1 && r.num_before < (r.num_columns-1)*r.num_per_column {
h.state.last_render.num_before = max(0, h.state.last_render.num_before+slots)
}
} }
} }
} }