Allow both action and completion lists to occupy max width and height of its element
This commit is contained in:
parent
513ddf1861
commit
bf35b78380
2 changed files with 34 additions and 5 deletions
|
@ -934,7 +934,9 @@ impl CompletionsMenu {
|
||||||
)
|
)
|
||||||
.max_h(max_height)
|
.max_h(max_height)
|
||||||
.track_scroll(self.scroll_handle.clone())
|
.track_scroll(self.scroll_handle.clone())
|
||||||
.with_width_from_item(widest_completion_ix);
|
.with_width_from_item(widest_completion_ix)
|
||||||
|
.use_max_height()
|
||||||
|
.use_max_width();
|
||||||
|
|
||||||
Popover::new()
|
Popover::new()
|
||||||
.child(list)
|
.child(list)
|
||||||
|
@ -1124,6 +1126,8 @@ impl CodeActionsMenu {
|
||||||
.max_by_key(|(_, action)| action.lsp_action.title.chars().count())
|
.max_by_key(|(_, action)| action.lsp_action.title.chars().count())
|
||||||
.map(|(ix, _)| ix),
|
.map(|(ix, _)| ix),
|
||||||
)
|
)
|
||||||
|
.use_max_width()
|
||||||
|
.use_max_height()
|
||||||
.into_any_element();
|
.into_any_element();
|
||||||
|
|
||||||
if self.deployed_from_indicator {
|
if self.deployed_from_indicator {
|
||||||
|
|
|
@ -56,6 +56,8 @@ where
|
||||||
..Default::default()
|
..Default::default()
|
||||||
},
|
},
|
||||||
scroll_handle: None,
|
scroll_handle: None,
|
||||||
|
use_max_width: false,
|
||||||
|
use_max_height: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,6 +66,8 @@ pub struct UniformList {
|
||||||
id: ElementId,
|
id: ElementId,
|
||||||
item_count: usize,
|
item_count: usize,
|
||||||
item_to_measure_index: usize,
|
item_to_measure_index: usize,
|
||||||
|
use_max_width: bool,
|
||||||
|
use_max_height: bool,
|
||||||
render_items:
|
render_items:
|
||||||
Box<dyn for<'a> Fn(Range<usize>, &'a mut WindowContext) -> SmallVec<[AnyElement; 64]>>,
|
Box<dyn for<'a> Fn(Range<usize>, &'a mut WindowContext) -> SmallVec<[AnyElement; 64]>>,
|
||||||
interactivity: Interactivity,
|
interactivity: Interactivity,
|
||||||
|
@ -280,19 +284,40 @@ impl UniformList {
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Forces the list to use the `AvailableSpace::MaxContent` for its items width during laying out.
|
||||||
|
pub fn use_max_width(mut self) -> Self {
|
||||||
|
self.use_max_width = true;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Forces the list to use the `AvailableSpace::MaxContent` for its items' height during laying out.
|
||||||
|
pub fn use_max_height(mut self) -> Self {
|
||||||
|
self.use_max_height = true;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
fn measure_item(&self, list_width: Option<Pixels>, cx: &mut ElementContext) -> Size<Pixels> {
|
fn measure_item(&self, list_width: Option<Pixels>, cx: &mut ElementContext) -> Size<Pixels> {
|
||||||
if self.item_count == 0 {
|
if self.item_count == 0 {
|
||||||
return Size::default();
|
return Size::default();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let width_default = if self.use_max_width {
|
||||||
|
AvailableSpace::MaxContent
|
||||||
|
} else {
|
||||||
|
AvailableSpace::MinContent
|
||||||
|
};
|
||||||
|
let height_default = if self.use_max_height {
|
||||||
|
AvailableSpace::MaxContent
|
||||||
|
} else {
|
||||||
|
AvailableSpace::MinContent
|
||||||
|
};
|
||||||
|
|
||||||
let item_ix = cmp::min(self.item_to_measure_index, self.item_count - 1);
|
let item_ix = cmp::min(self.item_to_measure_index, self.item_count - 1);
|
||||||
let mut items = (self.render_items)(item_ix..item_ix + 1, cx);
|
let mut items = (self.render_items)(item_ix..item_ix + 1, cx);
|
||||||
let mut item_to_measure = items.pop().unwrap();
|
let mut item_to_measure = items.pop().unwrap();
|
||||||
let available_space = size(
|
let available_space = size(
|
||||||
list_width.map_or(AvailableSpace::MinContent, |width| {
|
list_width.map_or(width_default, AvailableSpace::Definite),
|
||||||
AvailableSpace::Definite(width)
|
height_default,
|
||||||
}),
|
|
||||||
AvailableSpace::MinContent,
|
|
||||||
);
|
);
|
||||||
item_to_measure.measure(available_space, cx)
|
item_to_measure.measure(available_space, cx)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue