From 1b19053d6f259c8b23fe2f9d4ab1683ccc9cb1b9 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Mon, 26 Oct 2020 13:53:56 +0100 Subject: [PATCH] client: Remove offset support of draw_select and use win.subwin instead --- playbook/templates/client.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/playbook/templates/client.py b/playbook/templates/client.py index 8b396e9..537138d 100755 --- a/playbook/templates/client.py +++ b/playbook/templates/client.py @@ -58,16 +58,14 @@ def search_pictures(out, path): out(text_closed_pictures) return ret -def draw_select(win, dirs, sel, y_offset = 0): +def draw_select(win, dirs, sel): y_size, x_size = win.getmaxyx() - y_size -= y_offset # centered scroll y_center = y_size // 2 for y in range(y_size): - y_real = y + y_offset i = sel + y - y_center if i < 0 or len(dirs) <= i: - win.addstr(y_real, 1, " " * (x_size - 2), curses.A_NORMAL) + win.addstr(y, 1, " " * (x_size - 2), curses.A_NORMAL) else: text = " " text += indicator if i == sel else (" " * len(indicator)) @@ -75,7 +73,7 @@ def draw_select(win, dirs, sel, y_offset = 0): text += dirs[i].name text = stretch(text, x_size - 2) text_format = curses.A_STANDOUT if i == sel else curses.A_NORMAL - win.addstr(y_real, 1, text, text_format) + win.addstr(y, 1, text, text_format) return True def draw_header(win, base_dir, path): @@ -100,7 +98,7 @@ def show_select(win, base_dir, path): sel = 0 while True: draw_header(win, base_dir, path) - draw_select(win, dirs, sel, y_offset=3) + draw_select(win.subwin(3, 0), dirs, sel) c = win.getch() if c in binding_up: sel = max(0, sel - 1)