me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Draft Widget::overlay idempotency

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-07-05 05:44:10 +02:00
parent 61f22b1db2
commit 625979b665
11 changed files with 134 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

2
native/src/widget/column.rs
View file

@ -208,7 +208,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'a, Message, Renderer>> {
) -> Option<Overlay<'_, Message, Renderer>> {
self.children
.iter_mut()
.zip(layout.children())

64
native/src/widget/combo_box.rs
View file

@ -10,7 +10,7 @@ pub struct ComboBox<'a, T, Message, Renderer: self::Renderer>
where
[T]: ToOwned<Owned = Vec<T>>,
{
internal: Option<Internal<'a, T, Message>>,
internal: Internal<'a, T, Message>,
options: Cow<'a, [T]>,
selected: Option<T>,
width: Length,
@ -42,10 +42,10 @@ where
on_selected: impl Fn(T) -> Message + 'static,
) -> Self {
Self {
internal: Some(Internal {
internal: Internal {
menu: &mut state.menu,
on_selected: Box::new(on_selected),
}),
},
options: options.into(),
selected,
width: Length::Shrink,
@ -180,16 +180,14 @@ where
) {
match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
if let Some(internal) = &mut self.internal {
if layout.bounds().contains(cursor_position) {
let selected = self.selected.as_ref();
if layout.bounds().contains(cursor_position) {
let selected = self.selected.as_ref();
internal.menu.open(
self.options
.iter()
.position(|option| Some(option) == selected),
);
}
self.internal.menu.open(
self.options
.iter()
.position(|option| Some(option) == selected),
);
}
}
_ => {}
@ -217,33 +215,23 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'a, Message, Renderer>> {
let is_open = self
.internal
.as_ref()
.map(|internal| internal.menu.is_open())
.unwrap_or(false);
) -> Option<Overlay<'_, Message, Renderer>> {
if self.internal.menu.is_open() {
let bounds = layout.bounds();
if is_open {
if let Some(Internal { menu, on_selected }) = self.internal.take() {
let bounds = layout.bounds();
Some(Overlay::new(
layout.position(),
Box::new(Menu::new(
menu,
self.options.clone(),
on_selected,
bounds.width.round() as u16,
bounds.height,
self.text_size.unwrap_or(20),
self.padding,
Renderer::menu_style(&self.style),
)),
))
} else {
None
}
Some(Overlay::new(
layout.position(),
Box::new(Menu::new(
self.internal.menu,
self.options.clone(),
&self.internal.on_selected,
bounds.width.round() as u16,
bounds.height,
self.text_size,
self.padding,
Renderer::menu_style(&self.style),
)),
))
} else {
None
}

2
native/src/widget/container.rs
View file

@ -218,7 +218,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'a, Message, Renderer>> {
) -> Option<Overlay<'_, Message, Renderer>> {
self.content.overlay(layout.children().next().unwrap())
}
}

2
native/src/widget/row.rs
View file

@ -210,7 +210,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'a, Message, Renderer>> {
) -> Option<Overlay<'_, Message, Renderer>> {
self.children
.iter_mut()
.zip(layout.children())

8
native/src/widget/scrollable.rs
View file

@ -319,14 +319,16 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'a, Message, Renderer>> {
self.content
) -> Option<Overlay<'_, Message, Renderer>> {
let Self { content, state, .. } = self;
content
.overlay(layout.children().next().unwrap())
.map(|overlay| {
let bounds = layout.bounds();
let content_layout = layout.children().next().unwrap();
let content_bounds = content_layout.bounds();
let offset = self.state.offset(bounds, content_bounds);
let offset = state.offset(bounds, content_bounds);
overlay.translate(Vector::new(0.0, -(offset as f32)))
})