leyoda/libcosmic-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip rebase updates

Browse source
This commit is contained in:
Ashley Wulber 2026-02-10 15:37:41 -05:00
parent 86dcf8af6c
commit e10459fb37
68 changed files with 1776 additions and 1544 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/widget/wayland/tooltip/widget.rs
View file

@ -211,7 +211,7 @@ impl<'a, Message: 'static + Clone, TopLevelMessage: 'static + Clone>
}
fn layout(
&self,
&mut self,
tree: &mut Tree,
renderer: &crate::Renderer,
limits: &layout::Limits,
@ -224,22 +224,23 @@ impl<'a, Message: 'static + Clone, TopLevelMessage: 'static + Clone>
self.padding,
|renderer, limits| {
self.content
.as_widget()
.as_widget_mut()
.layout(&mut tree.children[0], renderer, limits)
},
)
}
fn operate(
&self,
&mut self,
tree: &mut Tree,
layout: Layout<'_>,
renderer: &crate::Renderer,
operation: &mut dyn Operation<()>,
) {
operation.container(None, layout.bounds(), &mut |operation| {
self.content.as_widget().operate(
&mut tree.children[0],
operation.container(Some(&self.id), layout.bounds());
operation.traverse(&mut |operation| {
self.content.as_widget_mut().operate(
tree,
layout
.children()
.next()
@ -251,17 +252,17 @@ impl<'a, Message: 'static + Clone, TopLevelMessage: 'static + Clone>
});
}
fn on_event(
fn update(
&mut self,
tree: &mut Tree,
event: Event,
event: &Event,
layout: Layout<'_>,
cursor: mouse::Cursor,
renderer: &crate::Renderer,
clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) -> event::Status {
) {
let status = update(
self.id.clone(),
event.clone(),
@ -275,22 +276,21 @@ impl<'a, Message: 'static + Clone, TopLevelMessage: 'static + Clone>
&self.on_surface_action,
|| tree.state.downcast_mut::<State>(),
);
status.merge(
self.content.as_widget_mut().on_event(
&mut tree.children[0],
event,
layout
.children()
.next()
.unwrap()
.with_virtual_offset(layout.virtual_offset()),
cursor,
renderer,
clipboard,
shell,
viewport,
),
)
self.content.as_widget_mut().update(
&mut tree.children[0],
event,
layout
.children()
.next()
.unwrap()
.with_virtual_offset(layout.virtual_offset()),
cursor,
renderer,
clipboard,
shell,
viewport,
);
}
#[allow(clippy::too_many_lines)]
@ -359,8 +359,9 @@ impl<'a, Message: 'static + Clone, TopLevelMessage: 'static + Clone>
fn overlay<'b>(
&'b mut self,
tree: &'b mut Tree,
layout: Layout<'_>,
layout: Layout<'b>,
renderer: &crate::Renderer,
viewport: &Rectangle,
mut translation: Vector,
) -> Option<overlay::Element<'b, Message, crate::Theme, crate::Renderer>> {
let position = layout.bounds().position();
@ -374,6 +375,7 @@ impl<'a, Message: 'static + Clone, TopLevelMessage: 'static + Clone>
.unwrap()
.with_virtual_offset(layout.virtual_offset()),
renderer,
viewport,
translation,
)
}
@ -451,7 +453,7 @@ pub fn update<'a, Message: Clone + 'static, TopLevelMessage: Clone + 'static>(
on_leave: &Message,
on_surface_action: &dyn Fn(crate::surface::Action) -> Message,
state: impl FnOnce() -> &'a mut State,
) -> event::Status {
) {
match event {
Event::Touch(touch::Event::FingerLifted { .. }) => {
let state = state();
@ -461,7 +463,8 @@ pub fn update<'a, Message: Clone + 'static, TopLevelMessage: Clone + 'static>(
shell.publish(on_leave.clone());
return event::Status::Captured;
shell.capture_event();
return;
}
}
@ -579,8 +582,6 @@ pub fn update<'a, Message: Clone + 'static, TopLevelMessage: Clone + 'static>(
}
_ => {}
}
event::Status::Ignored
}
#[allow(clippy::too_many_arguments)]
@ -611,6 +612,7 @@ pub fn draw<Renderer: iced_core::Renderer, Theme>(
radius: styling.border_radius,
},
shadow: Shadow::default(),
snap: true,
},
Color::TRANSPARENT,
);
@ -632,6 +634,7 @@ pub fn draw<Renderer: iced_core::Renderer, Theme>(
..Default::default()
},
shadow: Shadow::default(),
snap: true,
},
Background::Color([0.0, 0.0, 0.0, 0.5].into()),
);
@ -647,6 +650,7 @@ pub fn draw<Renderer: iced_core::Renderer, Theme>(
..Default::default()
},
shadow: Shadow::default(),
snap: true,
},
background,
);
@ -669,6 +673,7 @@ pub fn draw<Renderer: iced_core::Renderer, Theme>(
radius: styling.border_radius,
},
shadow: Shadow::default(),
snap: true,
},
Color::TRANSPARENT,
);