terminal user interface to jujutsu. Focused on speed and clarity
fix: multi line filler in log not indenting
+8
-4
+5
-2
forks/nottui/lib/nottui/widgets/selection_list.ml
+5
-2
forks/nottui/lib/nottui/widgets/selection_list.ml
···
16
16
| Filler of Ui.t Lwd.t
17
17
18
18
module MyMap = Map.Make (Int)
19
+
let singe_space= Shared.string " ";;
19
20
20
21
(** Get a map of all the selectable items*)
21
22
let get_selectable_items_map (items : 'a maybe_multi_selectable array Lwd.t) =
···
152
153
items
153
154
|> Array.mapi (fun i x ->
154
155
match x with
155
-
| Filler ui -> ui
156
+
(*Becasue selectable has a space used for the selection pointer, filler also needs a space*)
157
+
| Filler ui -> ui|>$(fun x-> Ui.hcat[ singe_space ; x])
156
158
| Selectable x ->
157
159
let hovered = hovered_id == x.id in
158
160
let selected = selected_items |> MyMap.mem x.id in
···
297
299
items
298
300
|> Array.mapi (fun i x ->
299
301
match x with
300
-
| Filler ui -> ui
302
+
(*Becasue selectable has a space used for the selection pointer, filler also needs a space*)
303
+
| Filler ui -> ui|>$(fun x-> Ui.hcat[ singe_space ; x])
301
304
| Selectable x ->
302
305
if hovered == i
303
306
then
+3
-2
jj_tui/bin/graph_view.ml
+3
-2
jj_tui/bin/graph_view.ml
···
481
481
| `Selectable x ->
482
482
let ui =
483
483
W.Lists.selectable_item
484
-
(x ^ "\n"
484
+
(
485
+
x ^ "\n"
485
486
(* TODO This won't work if we are on a branch, because that puts the @ further out*)
486
487
|> Jj_tui.AnsiReverse.colored_string
487
488
|> Ui.atom)
···
501
502
W.Lists.(Selectable data)
502
503
| `Filler x ->
503
504
W.Lists.(
504
-
Filler (" " ^ x |> Jj_tui.AnsiReverse.colored_string |> Ui.atom |> Lwd.pure)))
505
+
Filler ( x |> Jj_tui.AnsiReverse.colored_string |> Ui.atom |> Lwd.pure)))
505
506
in
506
507
items
507
508
in