git.iko.soy/helix
on master help sign in
Fix Component implementations for Picker (#7382)
9690e0bMichael Davis
helix-term/src/ui/picker.rs+27−27
compare with master
unifiedsplit
@@ -750,6 +750,33 @@ impl<T: Item + 'static> Picker<T> {
750 );
750 );
751 }
751 }
752 }
752 }
753+}
754+
755+impl<T: Item + 'static> Component for Picker<T> {
756+ fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
757+ // +---------+ +---------+
758+ // |prompt | |preview |
759+ // +---------+ | |
760+ // |picker | | |
761+ // | | | |
762+ // +---------+ +---------+
763+
764+ let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
765+
766+ let picker_width = if render_preview {
767+ area.width / 2
768+ } else {
769+ area.width
770+ };
771+
772+ let picker_area = area.with_width(picker_width);
773+ self.render_picker(picker_area, surface, cx);
774+
775+ if render_preview {
776+ let preview_area = area.clip_left(picker_width);
777+ self.render_preview(preview_area, surface, cx);
778+ }
779+ }
753
780
754 fn handle_event(&mut self, event: &Event, ctx: &mut Context) -> EventResult {
781 fn handle_event(&mut self, event: &Event, ctx: &mut Context) -> EventResult {
755 if let Event::IdleTimeout = event {
782 if let Event::IdleTimeout = event {
@@ -846,33 +873,6 @@ impl<T: Item + 'static> Picker<T> {
846 }
873 }
847}
874}
848
875
849−impl<T: Item + 'static> Component for Picker<T> {
850− fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
851− // +---------+ +---------+
852− // |prompt | |preview |
853− // +---------+ | |
854− // |picker | | |
855− // | | | |
856− // +---------+ +---------+
857−
858− let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
859−
860− let picker_width = if render_preview {
861− area.width / 2
862− } else {
863− area.width
864− };
865−
866− let picker_area = area.with_width(picker_width);
867− self.render_picker(picker_area, surface, cx);
868−
869− if render_preview {
870− let preview_area = area.clip_left(picker_width);
871− self.render_preview(preview_area, surface, cx);
872− }
873− }
874−}
875−
876#[derive(PartialEq, Eq, Debug)]
876#[derive(PartialEq, Eq, Debug)]
877struct PickerMatch {
877struct PickerMatch {
878 score: i64,
878 score: i64,