suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stack picker and preview vertically if too narrow 

Co-authored-by: Jesse Luehrs <doy@tozt.net>
pull/13430/head
Em Zhan 2025-04-27 17:11:24 -05:00
parent 9f3b193743
commit fc01d4eecc
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
helix-term/src/ui/picker.rs
View File

@ -57,6 +57,7 @@ use self::handlers::{DynamicQueryChange, DynamicQueryHandler, PreviewHighlightHa
pub const ID: &str = "picker"; pub const ID: &str = "picker";
pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72; pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
pub const MIN_AREA_HEIGHT_FOR_PREVIEW: u16 = 24;
/// Biggest file size to preview in bytes /// Biggest file size to preview in bytes
pub const MAX_FILE_SIZE_FOR_PREVIEW: u64 = 10 * 1024 * 1024; pub const MAX_FILE_SIZE_FOR_PREVIEW: u64 = 10 * 1024 * 1024;
@ -988,27 +989,50 @@ impl<T: 'static + Send + Sync, D: 'static + Send + Sync> Picker<T, D> {
impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I, D> { impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I, D> {
fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) { fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
// default render
// +---------+ +---------+ // +---------+ +---------+
// |prompt | |preview | // |prompt | |preview |
// +---------+ | | // +---------+ | |
// |picker | | | // |picker | | |
// | | | | // | | | |
// +---------+ +---------+ // +---------+ +---------+
//
// stack vertically
// +---------+
// |prompt |
// +---------+
// |picker |
// | |
// +---------+
// |preview |
// | |
// | |
// +---------+
let render_preview = let render_preview = self.show_preview
self.show_preview && self.file_fn.is_some() && area.width > MIN_AREA_WIDTH_FOR_PREVIEW; && self.file_fn.is_some()
&& area.width >= MIN_AREA_WIDTH_FOR_PREVIEW
&& area.height >= MIN_AREA_HEIGHT_FOR_PREVIEW;
let stack_vertically = area.width / 2 < MIN_AREA_WIDTH_FOR_PREVIEW;
let picker_width = if render_preview { let picker_area = if render_preview {
area.width / 2 if stack_vertically {
area.with_height(area.height / 3)
} else {
area.with_width(area.width / 2)
}
} else { } else {
area.width area
}; };
let picker_area = area.with_width(picker_width);
self.render_picker(picker_area, surface, cx); self.render_picker(picker_area, surface, cx);
if render_preview { if render_preview {
let preview_area = area.clip_left(picker_width); let preview_area = if stack_vertically {
area.clip_top(picker_area.height)
} else {
area.clip_left(picker_area.width)
};
self.render_preview(preview_area, surface, cx); self.render_preview(preview_area, surface, cx);
} }
} }
@ -1135,10 +1159,13 @@ impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I,
let inner = block.inner(area); let inner = block.inner(area);
// prompt area // prompt area
let render_preview = let render_preview = self.show_preview
self.show_preview && self.file_fn.is_some() && area.width > MIN_AREA_WIDTH_FOR_PREVIEW; && self.file_fn.is_some()
&& area.width >= MIN_AREA_WIDTH_FOR_PREVIEW
&& area.height >= MIN_AREA_HEIGHT_FOR_PREVIEW;
let stack_vertically = area.width / 2 < MIN_AREA_WIDTH_FOR_PREVIEW;
let picker_width = if render_preview { let picker_width = if render_preview && !stack_vertically {
area.width / 2 area.width / 2
} else { } else {
area.width area.width