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

Refactor common logic into helper function

pull/13430/head
Em Zhan 2025-06-09 23:28:27 -05:00
parent fc01d4eecc
commit 009024a720
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1009,12 +1009,7 @@ impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I,
// | |
// +---------+
let render_preview = self.show_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 (render_preview, stack_vertically) = self.get_picker_layout(area);
let picker_area = if render_preview {
if stack_vertically {
area.with_height(area.height / 3)
@ -1158,21 +1153,15 @@ impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I,
// calculate the inner area inside the box
let inner = block.inner(area);
// prompt area
let render_preview = self.show_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 (render_preview, stack_vertically) = self.get_picker_layout(area);
let picker_width = if render_preview && !stack_vertically {
area.width / 2
} else {
area.width
};
let area = inner.clip_left(1).with_height(1).with_width(picker_width);
let prompt_area = inner.clip_left(1).with_height(1).with_width(picker_width);
self.prompt.cursor(area, editor)
self.prompt.cursor(prompt_area, editor)
}
fn required_size(&mut self, (width, height): (u16, u16)) -> Option<(u16, u16)> {
@ -1190,5 +1179,15 @@ impl<T: 'static + Send + Sync, D> Drop for Picker<T, D> {
self.version.fetch_add(1, atomic::Ordering::Relaxed);
}
}
impl<T: 'static + Send + Sync, D> Picker<T, D> {
fn get_picker_layout(&self, area: Rect) -> (bool, bool) {
let render_preview = self.show_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;
return (render_preview, stack_vertically);
}
}
type PickerCallback<T> = Box<dyn Fn(&mut Context, &T, Action)>;