-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add
PageUp, PageDown, Ctrl-u, Ctrl-d, Home, End keyboard …
…shortcuts to file picker (#1612) * Add `PageUp`, `PageDown`, `Ctrl-u`, `Ctrl-d`, `Home`, `End` keyboard shortcuts to file picker * Refactor file picker paging logic * change key mapping * Add overlay component * Use closure instead of margin to calculate size * Don't wrap file picker in `Overlay` automatically
- Loading branch information
Showing
6 changed files
with
151 additions
and
56 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| use crossterm::event::Event; | ||
| use helix_core::Position; | ||
| use helix_view::{ | ||
| graphics::{CursorKind, Rect}, | ||
| Editor, | ||
| }; | ||
| use tui::buffer::Buffer; | ||
|
|
||
| use crate::compositor::{Component, Context, EventResult}; | ||
|
|
||
| /// Contains a component placed in the center of the parent component | ||
| pub struct Overlay<T> { | ||
| /// Child component | ||
| pub content: T, | ||
| /// Function to compute the size and position of the child component | ||
| pub calc_child_size: Box<dyn Fn(Rect) -> Rect>, | ||
| } | ||
|
|
||
| /// Surrounds the component with a margin of 5% on each side, and an additional 2 rows at the bottom | ||
| pub fn overlayed<T>(content: T) -> Overlay<T> { | ||
| Overlay { | ||
| content, | ||
| calc_child_size: Box::new(|rect: Rect| clip_rect_relative(rect.clip_bottom(2), 90, 90)), | ||
| } | ||
| } | ||
|
|
||
| fn clip_rect_relative(rect: Rect, percent_horizontal: u8, percent_vertical: u8) -> Rect { | ||
| fn mul_and_cast(size: u16, factor: u8) -> u16 { | ||
| ((size as u32) * (factor as u32) / 100).try_into().unwrap() | ||
| } | ||
|
|
||
| let inner_w = mul_and_cast(rect.width, percent_horizontal); | ||
| let inner_h = mul_and_cast(rect.height, percent_vertical); | ||
|
|
||
| let offset_x = rect.width.saturating_sub(inner_w) / 2; | ||
| let offset_y = rect.height.saturating_sub(inner_h) / 2; | ||
|
|
||
| Rect { | ||
| x: rect.x + offset_x, | ||
| y: rect.y + offset_y, | ||
| width: inner_w, | ||
| height: inner_h, | ||
| } | ||
| } | ||
|
|
||
| impl<T: Component + 'static> Component for Overlay<T> { | ||
| fn render(&mut self, area: Rect, frame: &mut Buffer, ctx: &mut Context) { | ||
| let dimensions = (self.calc_child_size)(area); | ||
| self.content.render(dimensions, frame, ctx) | ||
| } | ||
|
|
||
| fn required_size(&mut self, (width, height): (u16, u16)) -> Option<(u16, u16)> { | ||
| let area = Rect { | ||
| x: 0, | ||
| y: 0, | ||
| width, | ||
| height, | ||
| }; | ||
| let dimensions = (self.calc_child_size)(area); | ||
| let viewport = (dimensions.width, dimensions.height); | ||
| let _ = self.content.required_size(viewport)?; | ||
| Some((width, height)) | ||
| } | ||
|
|
||
| fn handle_event(&mut self, event: Event, ctx: &mut Context) -> EventResult { | ||
| self.content.handle_event(event, ctx) | ||
| } | ||
|
|
||
| fn cursor(&self, area: Rect, ctx: &Editor) -> (Option<Position>, CursorKind) { | ||
| let dimensions = (self.calc_child_size)(area); | ||
| self.content.cursor(dimensions, ctx) | ||
| } | ||
| } |
This file contains 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