feat: emphasize active tix shortcut prefixes

Expanded shortcut groups previously differed from their collapsed form primarily through parentheses and an underlined key. That cue was easy to miss in the dense history footer, particularly when deciding whether the next key would invoke a direct action or a prefixed one. Reverse every cell belonging to the open view, edit, or information group while preserving its existing colors, dimmed toggles, and underlines. Keep separators and neighboring top-level actions outside the reversed range so the active mode has a strong, theme-independent boundary.

Codex committed 3 months ago

Commit 152ee6b1 parent 1a7f9332 files · +38 −2Browse files

Unified · Split

2 files

gix-tix/spec.md +3 −2
gix-tix/src/ui.rs +35 −0

gix-tix/spec.md+3−2

 actions retain their direct shortcuts while the group is closed. While expanded,
 the group visually contains every following status action through `<enter> diff`,
 including pane switching and navigation; none of those hints is visible while
-the group is closed, and quit remains outside it. The footer
+the group is closed, and quit remains outside it. The footer underlines the `v`
-underlines the `v` in `view`; while active, `view (` contains
+in `view`; an open prefix reverses its complete expanded group for a strong,
+terminal-theme-independent cue. While active, `view (` contains
 every applicable display option and a closing `)` so direct shortcuts remain visibly
 outside the prefix. The history status starts with the history position, then the
 `v` prefix and the `e` prefix when it is addressable. Remaining history-level

gix-tix/src/ui.rs+35−0

                 }
             }
             edit_prefix_spans.push(Span::raw(")"));
+            emphasize_prefix(&mut edit_prefix_spans[1..]);
         } else if !app.history_display_expanded {
             edit_prefix_spans.push(Span::raw(" · "));
             edit_prefix_spans.push(Span::styled("e", Style::default().add_modifier(Modifier::UNDERLINED)));
             ));
         }
         view_prefix_spans.push(Span::raw(")"));
+        emphasize_prefix(&mut view_prefix_spans[1..]);
     } else {
         view_prefix_spans.push(Span::raw(" · "));
         view_prefix_spans.push(Span::styled("v", Style::default().add_modifier(Modifier::UNDERLINED)));
     ordered.push(Span::raw(" · "));
     ordered.extend(shortcut("refs", 'r', app.ref_mode != RefMode::None));
     ordered.push(Span::raw(" · "));
+    let information_prefix_start = app.information_expanded.then_some(ordered.len());
     ordered.push(Span::styled("?", Style::default().add_modifier(Modifier::UNDERLINED)));
     if app.information_expanded {
         ordered.push(Span::raw(" ("));
             footer_spans.push(Span::raw(" · <enter> diff"));
         }
         footer_spans.push(Span::raw(")"));
+        emphasize_prefix(&mut footer_spans[information_prefix_start.expect("the prefix is expanded")..]);
     }
     if app.changes_focus.is_none() {
         footer_spans.push(Span::raw(" · "));
     ]
 }
+fn emphasize_prefix(spans: &mut [Span<'_>]) {
+    for span in spans {
+        span.style = span.style.add_modifier(Modifier::REVERSED);
+    }
+}
 fn notification_discs(spans: Vec<Span<'_>>) -> Vec<Span<'_>> {
     let mut out = Vec::with_capacity(spans.len());
     for span in spans {
                 .contains(Modifier::UNDERLINED),
             "the prefix key is underlined in its verb"
         );
+        assert_reversed_group(&terminal, 1, view);
         app.history_display_expanded = false;
         app.edit_expanded = true;
             rendered_line(&terminal, 1).starts_with("0 commits · view · edit (no actions) · copy · refs · ?"),
             "the edit prefix follows the view prefix even when no action is available"
         );
+        assert_reversed_group(&terminal, 1, "edit (no actions)");
         app.edit_expanded = false;
         app.information_expanded = true;
                 ),
             "the information prefix contains every following action except quit: {footer}"
         );
+        assert_reversed_group(
+            &terminal,
+            1,
+            "? ([ align · message · changes · Esc cancel · ↑↓/jk move · h/l pan · <enter> diff)",
+        );
         Ok(())
     }
         })
     }
+    fn assert_reversed_group(terminal: &Terminal<TestBackend>, y: u16, group: &str) {
+        let line = rendered_line(terminal, y);
+        let start = line[..line.find(group).expect("the active prefix group is visible")]
+            .chars()
+            .count() as u16;
+        let end = start + group.chars().count() as u16;
+        let buffer = terminal.backend().buffer();
+        assert!(
+            (start..end).all(|x| buffer[(x, y)].modifier.contains(Modifier::REVERSED)),
+            "every cell in {group:?} is reversed"
+        );
+        assert!(
+            !buffer[(start - 1, y)].modifier.contains(Modifier::REVERSED)
+                && !buffer[(end, y)].modifier.contains(Modifier::REVERSED),
+            "the active treatment is bounded to {group:?}"
+        );
+    }
     fn footer_is_dim(terminal: &Terminal<TestBackend>, label: &str) -> bool {
         let y = terminal.backend().buffer().area.height - 1;
         let footer = rendered_line(terminal, y);

feat: emphasize active tix shortcut prefixes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code