From 4560f038b1c278d96f93aa3f13245022da366023 Mon Sep 17 00:00:00 2001 From: zenith <157907903+RFnexus@users.noreply.github.com> Date: Thu, 21 May 2026 04:11:11 -0400 Subject: [PATCH] Fix Guide.py to allow for scroll_line_up and out of the reader --- nomadnet/ui/textui/Guide.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nomadnet/ui/textui/Guide.py b/nomadnet/ui/textui/Guide.py index 712b2a1..4b1a71b 100644 --- a/nomadnet/ui/textui/Guide.py +++ b/nomadnet/ui/textui/Guide.py @@ -72,6 +72,22 @@ def _rows_above(attrmaps, index, cols): return total +class GuideColumns(urwid.Columns): + def keypress(self, size, key): + if key == "up" and self.focus_position == 1: + disp = getattr(self, "guide_display", None) + if disp is not None: + scrollable = getattr(disp, "_content_scrollable", None) + if scrollable is not None: + try: + if scrollable.get_scrollpos() <= 0: + nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header" + return None + except Exception: + pass + return super().keypress(size, key) + + class GuideLinkDelegate: def __init__(self, app, reader=None): self.app = app @@ -190,13 +206,14 @@ class GuideDisplay(): self.right_area = urwid.LineBox(urwid.Filler(topic_text, urwid.TOP)) - self.columns = urwid.Columns( + self.columns = GuideColumns( [ (urwid.WEIGHT, GuideDisplay.list_width, self.left_area), (urwid.WEIGHT, 1-GuideDisplay.list_width, self.right_area) ], dividechars=0, focus_column=0 ) + self.columns.guide_display = self self.shortcuts_display = GuideDisplayShortcuts(self.app) self.widget = self.columns