feat: align menu key and label spacing #476
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Improve menu display by aligning keys and labels in columns. Keys are right-padded to match the longest key in each column. When multiple key bindings are grouped for the same operation (e.g., "k/up" or "ctrl+k/ctrl+up"), the maximum width is calculated based on the combined string length. Before: ``` Y Show Refs b Branch k/up Up c Commit ctrl+k/ctrl+up Up line h/? Help ``` After: ``` Y Show Refs b Branch k/up Up c Commit ctrl+k/ctrl+up Up line h/? Help ``` 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <[email protected]>
Contributor
Author
|
Note: This PR will likely conflict with #475 as both modify the menu rendering code in |
- Extract key string formatting into helper functions with shared macro - Extract padding calculation into dedicated function - Eliminate duplicate iteration by collecting grouped bindings once - Improve code maintainability while preserving functionality
altsem
requested changes
Dec 13, 2025
Owner
altsem
left a comment
There was a problem hiding this comment.
How about
layout.vertical(None, OPTS, |layout| {
ui::repeat_chars(layout, width, ui::DASHES, ui::STYLE);
layout.horizontal(None, OPTS.gap(3).pad(1), |layout| {
layout.vertical(None, OPTS, |layout| {
// TODO Print header e.g. "Help"
layout.horizontal(None, OPTS.gap(1), |layout| {
layout.vertical(None, OPTS, |layout| {
for (op, _binds) in grouped_bindings.iter() {
// TODO Print keys e.g. "q/esc"
}
});
layout.vertical(None, OPTS, |layout| {
for (_op, binds) in grouped_bindings.iter() {
// TODO Print op e.g. "Quit/Close"
}
});
});
});
// etc...Replace manual padding calculation with layout system's automatic column width alignment. Introduces `layout_keybinds_table` helper function that uses horizontal layout with two vertical columns (keys and labels) separated by gap(1). Key improvements: - Removed `calc_padding` function and max width calculations - Use `partition` to efficiently split bindings by type - Use `into_iter` instead of `iter` where ownership can be moved - Extract common key-value table pattern into helper function - Let layout system handle column alignment automatically - Fix `layout_line` to properly merge Line and Span styles The visual output remains unchanged. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improve menu display by aligning keys and labels in columns. Keys are right-padded to match the longest key in each column.
When multiple key bindings are grouped for the same operation (e.g., "k/up" or "ctrl+k/ctrl+up"), the maximum width is calculated based on the combined string length.
Before:
After:
🤖 Generated with Claude Code
Co-Authored-By: Claude Sonnet 4.5 [email protected]