refactor: simplify _build_body and _handle_fullscreen_key conditionals

Deduplicate the peek-message append that appeared in two separate
branches of _build_body by replacing the nested if/elif/elif with a
single `if not rows` guard after the scroll-lines block.

Invert the condition in _handle_fullscreen_key to eliminate the
confusing `if key in (...): pass` pattern; the scroll-key block now
lives under `if key not in (...)` with an early return, and the exit
path falls through naturally.

Co-authored-by: Ralphify <noreply@ralphify.co>

Author: 2 people

src/ralphify/_console_emitter.py

@@ -362,14 +362,11 @@ def _build_body(self) -> Group:
         rows: list[Any] = []
         if self._peek_visible:
             visible = self._scroll_lines[-_MAX_VISIBLE_SCROLL:]
-            if visible:
-                for line in visible:
-                    line.no_wrap = True
-                    line.overflow = "ellipsis"
-                    rows.append(line)
-            elif self._peek_message is not None:
-                rows.append(self._peek_message)
-        elif self._peek_message is not None:
+            for line in visible:
+                line.no_wrap = True
+                line.overflow = "ellipsis"
+                rows.append(line)
+        if not rows and self._peek_message is not None:
             rows.append(self._peek_message)
         rows.append(Text(""))  # spacer above footer
         rows.append(self._build_footer())
@@ -596,10 +593,10 @@ def _build_footer(self) -> Table:
 # ── Full-screen peek ─────────────────────────────────────────────────
 
 # Chrome rows that the fullscreen peek reserves on top of its viewport:
-# panel top border + header row + header gap + footer gap + footer row +
-# panel bottom border.  Used to size the visible viewport to the terminal.
-_FULLSCREEN_CHROME_ROWS = 6
-_FULLSCREEN_MIN_VISIBLE = 5
+# panel top border (1) + panel bottom border (1).  Header lives in the
+# panel title and footer in the subtitle, so they cost no extra rows.
+_FULLSCREEN_CHROME_ROWS = 2
+_FULLSCREEN_MIN_VISIBLE = 3
 
 
 @dataclass(slots=True)
@@ -704,12 +701,13 @@ def _build_header(self, total: int, visible: int) -> Text:
             end = total - self._offset
             header.append("  ·  ", style="dim")
             header.append(f"lines {start}–{end}", style=f"italic {_brand.LAVENDER}")
+        header.append(" ", style="dim")
         return header
 
     def _build_footer(self) -> Text:
         hint = Text(no_wrap=True, overflow="ellipsis")
         hint.append(
-            " ↑/k up · ↓/j down · b page up · space page down · g/G top/bottom · q/",
+            " ↑/↓ scroll · space/b page · g/G top/bottom · q/",
             style="dim",
         )
         hint.append(FULLSCREEN_PEEK_KEY, style=f"bold {_brand.PURPLE}")
@@ -738,18 +736,20 @@ def __rich_console__(
 
         sb = _scrollbar_metrics(total, visible, self._offset)
 
-        rows: list[Any] = []
-        rows.append(self._build_header(total, visible))
-        rows.append(Text(""))
-
-        # Content area with optional scrollbar column
+        # Body is exactly `visible` rows tall: a single Table.grid that
+        # always pads to the viewport height (with empty Text rows when
+        # the buffer is shorter than the viewport) so the panel's height
+        # never depends on how full the buffer is.
         content = Table.grid(expand=True)
         content.add_column(ratio=1, no_wrap=True, overflow="ellipsis")
         if sb.show:
             content.add_column(width=1, no_wrap=True)
 
+        show_waiting = not window and not sb.show
         for i in range(visible):
-            if i < len(window):
+            if show_waiting and i == 0:
+                line: Text = Text("  (waiting for activity…)", style="dim italic")
+            elif i < len(window):
                 line = window[i]
                 line.no_wrap = True
                 line.overflow = "ellipsis"
@@ -765,22 +765,16 @@ def __rich_console__(
             else:
                 content.add_row(line)
 
-        if not window and not sb.show:
-            # Replace the empty grid with a waiting message
-            rows.append(Text("  (waiting for activity…)", style="dim italic"))
-            for _ in range(max(0, visible - 1)):
-                rows.append(Text(""))
-        else:
-            rows.append(content)
-
-        rows.append(Text(""))
-        rows.append(self._build_footer())
-
         panel = Panel(
-            Group(*rows),
+            content,
             box=box.ROUNDED,
+            title=self._build_header(total, visible),
+            title_align="left",
+            subtitle=self._build_footer(),
+            subtitle_align="left",
             border_style=_brand.PURPLE,
-            padding=(0, 2),
+            padding=(0, 1),
+            height=visible + _FULLSCREEN_CHROME_ROWS,
         )
         yield panel
 
@@ -1035,6 +1029,7 @@ def enter_fullscreen(self) -> bool:
                 console=self._console,
                 screen=True,
                 refresh_per_second=_LIVE_REFRESH_RATE,
+                vertical_overflow="crop",
             )
             try:
                 self._fullscreen_live.start()
@@ -1078,7 +1073,11 @@ def _restart_compact_unlocked(self) -> None:
         self._live.start()
 
     def _fullscreen_page_size(self) -> int:
-        """Lines to jump on space/b (page down/up)."""
+        """Lines to jump on space/b (page down/up).
+
+        One viewport minus a 2-line overlap so the user can keep their
+        place across page jumps.
+        """
         try:
             height = self._console.size.height
         except Exception:
@@ -1110,10 +1109,7 @@ def _handle_fullscreen_key(self, key: str) -> None:
             view = self._fullscreen_view
             if view is None:
                 return  # raced with exit
-            if key in ("q", FULLSCREEN_PEEK_KEY):
-                # Release lock before exit_fullscreen re-acquires it.
-                pass
-            else:
+            if key not in ("q", FULLSCREEN_PEEK_KEY):
                 page = self._fullscreen_page_size()
                 handled = True
                 if key == "j":

tests/test_console_emitter.py

@@ -1554,17 +1554,17 @@ def test_scroll_down_back_to_bottom_re_enables_follow(self):
     def test_scroll_up_clamped_to_top(self):
         source = self._make_source(30)
         view = _FullscreenPeek(source)
-        view._console_height = 40  # visible = 34 > 30, so max_offset = 0
+        view._console_height = 40  # visible = 38 > 30, so max_offset = 0
         view.scroll_up(100)
         assert view._offset == 0
 
     def test_scroll_to_top_clamps_to_max_offset(self):
         source = self._make_source(500)
         view = _FullscreenPeek(source)
-        view._console_height = 40  # visible = 34
+        view._console_height = 40  # visible = 38
         view.scroll_to_top()
-        # 500 total - 34 visible = 466
-        assert view._offset == 466
+        # 500 total - 38 visible = 462
+        assert view._offset == 462
         assert view._auto_scroll is False
 
     def test_scroll_to_bottom_re_enables_follow(self):
@@ -1582,8 +1582,8 @@ def test_render_shows_newest_by_default(self):
         console = Console(record=True, width=120, height=15, force_terminal=True)
         console.print(view)
         output = console.export_text()
-        # With height 15 and chrome 6, visible ≈ 9, so the last lines
-        # (0019, 0018, …) should appear.
+        # With height 15 and chrome 2, visible = 13, so the last lines
+        # (0019 down to 0007) should appear.
         assert "line 0019" in output
         assert "line 0000" not in output