Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support toggling pickers' preview panel #3021

Merged
merged 2 commits into from
Jul 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions book/src/keymap.md
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ Keys to use within picker. Remapping currently not supported.
| `Enter` | Open selected |
| `Ctrl-s` | Open horizontally |
| `Ctrl-v` | Open vertically |
| `Ctrl-t` | Toggle preview |
| `Escape`, `Ctrl-c` | Close picker |

# Prompt
Expand Down
12 changes: 11 additions & 1 deletion helix-term/src/ui/picker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ impl<T: Item + 'static> Component for FilePicker<T> {
// | | | |
// +---------+ +---------+

let render_preview = area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
let render_preview = self.picker.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
// -- Render the frame:
// clear area
let background = cx.editor.theme.get("ui.background");
Expand Down Expand Up @@ -300,6 +300,8 @@ pub struct Picker<T: Item> {
previous_pattern: String,
/// Whether to truncate the start (default true)
pub truncate_start: bool,
/// Whether to show the preview panel (default true)
show_preview: bool,

callback_fn: Box<dyn Fn(&mut Context, &T, Action)>,
}
Expand Down Expand Up @@ -327,6 +329,7 @@ impl<T: Item> Picker<T> {
prompt,
previous_pattern: String::new(),
truncate_start: true,
show_preview: true,
callback_fn: Box::new(callback_fn),
completion_height: 0,
};
Expand Down Expand Up @@ -470,6 +473,10 @@ impl<T: Item> Picker<T> {
self.filters.sort_unstable(); // used for binary search later
self.prompt.clear(cx);
}

pub fn toggle_preview(&mut self) {
self.show_preview = !self.show_preview;
}
}

// process:
Expand Down Expand Up @@ -538,6 +545,9 @@ impl<T: Item + 'static> Component for Picker<T> {
ctrl!(' ') => {
self.save_filter(cx);
}
ctrl!('t') => {
self.toggle_preview();
}
_ => {
if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
// TODO: recalculate only if pattern changed
Expand Down