2a8d38c · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

support toggling pickers' preview panel (#3021)

2a8d38cBob4 years ago

book/src/keymap.md+1

compare with master

unifiedsplit

@@ -352,6 +352,7 @@ Keys to use within picker. Remapping currently not supported.

352| `Enter` | Open selected |

353| `Ctrl-s` | Open horizontally |

354| `Ctrl-v` | Open vertically |

355+| `Ctrl-t` | Toggle preview |

355| `Escape`, `Ctrl-c` | Close picker |

356| `Escape`, `Ctrl-c` | Close picker |

356

357

357# Prompt

358# Prompt

helix-term/src/ui/picker.rs+11−1

@@ -173,7 +173,7 @@ impl<T: Item + 'static> Component for FilePicker<T> {

173 // | | | |

174 // +---------+ +---------+

175

176− let render_preview = area.width > MIN_AREA_WIDTH_FOR_PREVIEW;

176+ let render_preview = self.picker.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;

177 // -- Render the frame:

178 // clear area

179 let background = cx.editor.theme.get("ui.background");

@@ -300,6 +300,8 @@ pub struct Picker<T: Item> {

300 previous_pattern: String,

301 /// Whether to truncate the start (default true)

302 pub truncate_start: bool,

303+ /// Whether to show the preview panel (default true)

304+ show_preview: bool,

303

305

304 callback_fn: Box<dyn Fn(&mut Context, &T, Action)>,

306 callback_fn: Box<dyn Fn(&mut Context, &T, Action)>,

305}

307}

@@ -327,6 +329,7 @@ impl<T: Item> Picker<T> {

327 prompt,

329 prompt,

328 previous_pattern: String::new(),

330 previous_pattern: String::new(),

329 truncate_start: true,

331 truncate_start: true,

332+ show_preview: true,

330 callback_fn: Box::new(callback_fn),

333 callback_fn: Box::new(callback_fn),

331 completion_height: 0,

334 completion_height: 0,

332 };

335 };

@@ -470,6 +473,10 @@ impl<T: Item> Picker<T> {

470 self.filters.sort_unstable(); // used for binary search later

473 self.filters.sort_unstable(); // used for binary search later

471 self.prompt.clear(cx);

474 self.prompt.clear(cx);

472 }

475 }

476+

477+ pub fn toggle_preview(&mut self) {

478+ self.show_preview = !self.show_preview;

479+ }

473}

480}

474

481

475// process:

482// process:

@@ -538,6 +545,9 @@ impl<T: Item + 'static> Component for Picker<T> {

538 ctrl!(' ') => {

545 ctrl!(' ') => {

539 self.save_filter(cx);

546 self.save_filter(cx);

540 }

547 }

548+ ctrl!('t') => {

549+ self.toggle_preview();

550+ }

541 _ => {

551 _ => {

542 if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {

552 if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {

543 // TODO: recalculate only if pattern changed

553 // TODO: recalculate only if pattern changed