Skip to content

Make sure that the shorten function terminates #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make sure that the shorten function terminates #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbdc68a
Clean up bits of app.ml
co-dan May 22, 2021
acc62da
Make sure that `shorten` terminates.
co-dan May 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/app.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ let draw_horizontal { ui_state; state; colors; _ } =
)

let rec shorten ui_state candidate s =
if Ui.text_width ui_state (candidate.display ^ s)
<= X11.get_width () - 10 then
if String.equal s "" ||
Ui.text_width ui_state (candidate.display ^ s) <= X11.get_width () - 10 then
s
else
shorten ui_state candidate
Expand Down Expand Up @@ -127,7 +127,7 @@ let draw ({ ui_state; prompt; state; topbar; colors; _ } as app_state) =
let cairo_ctx = Draw.cairo_ctx dstate in

Draw.render dstate ~height:total_height (fun () ->
Draw.set_source_rgb dstate app_state.colors.window_background;
Draw.set_source_rgb dstate colors.window_background;
Cairo.paint cairo_ctx;

let oy = if topbar then 0. else float (total_height - bar_geometry.height) in
Expand All @@ -138,7 +138,7 @@ let draw ({ ui_state; prompt; state; topbar; colors; _ } as app_state) =
incr ui_state
);

state.State.entries |> List.iter ~f:(fun (_, candidate) ->
state.entries |> List.iter ~f:(fun (_, candidate) ->
Ui.draw_text ~colors ~focus:false ui_state candidate.display;
incr ui_state
);
Expand All @@ -148,14 +148,13 @@ let draw ({ ui_state; prompt; state; topbar; colors; _ } as app_state) =
incr ui_state;

let extra_lines_y = if topbar then float bar_geometry.height else 0. in
begin match app_state.state.State.layout with
begin match state.layout with
| State.Grid (_, None)
| State.SingleLine -> draw_horizontal app_state

| State.MultiLine _ ->
Cairo.move_to cairo_ctx 0. extra_lines_y;
draw_vertical app_state extra_lines_geometry
app_state.state.State.candidates
draw_vertical app_state extra_lines_geometry state.candidates

| State.Grid (_, Some { pages ; _ }) ->
draw_horizontal app_state;
Expand Down