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

fix(applet): improve cursor handling

Browse source
This commit is contained in:
Ashley Wulber 2025-10-22 13:10:34 -04:00
parent 7cae9aa47d
commit 853f9d73a8
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
2 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/applet/column.rs
View file

@ -336,7 +336,17 @@ where
) && cursor.is_over(c_layout.bounds())
{
my_state.hovered = Some(i);
} else if my_state.hovered.is_some_and(|h| i == h) {
return child.as_widget_mut().on_event(
state,
event.clone(),
c_layout.with_virtual_offset(layout.virtual_offset()),
cursor_virtual,
renderer,
clipboard,
shell,
viewport,
);
} else if my_state.hovered.is_some_and(|h| i != h) {
cursor_virtual = mouse::Cursor::Unavailable;
}
@ -344,7 +354,7 @@ where
state,
event.clone(),
c_layout.with_virtual_offset(layout.virtual_offset()),
cursor,
cursor_virtual,
renderer,
clipboard,
shell,
@ -390,18 +400,21 @@ where
viewport: &Rectangle,
) {
if let Some(clipped_viewport) = layout.bounds().intersection(viewport) {
let my_state = tree.state.downcast_ref::<State>();
let viewport = if self.clip {
&clipped_viewport
} else {
viewport
};
for ((child, state), c_layout) in self
for (i, ((child, state), c_layout)) in self
.children
.iter()
.zip(&tree.children)
.zip(layout.children())
.filter(|(_, layout)| layout.bounds().intersects(viewport))
.enumerate()
{
child.as_widget().draw(
state,
@ -409,7 +422,11 @@ where
theme,
style,
c_layout.with_virtual_offset(layout.virtual_offset()),
cursor,
if my_state.hovered.is_some_and(|h| i == h) {
cursor
} else {
mouse::Cursor::Unavailable
},
viewport,
);
}

27
src/applet/row.rs
View file

@ -314,6 +314,8 @@ where
.zip(&mut tree.children)
.zip(layout.children())
.map(|(((i, child), state), c_layout)| {
let mut cursor_virtual = cursor;
if matches!(
event,
Event::Mouse(mouse::Event::CursorMoved { .. } | mouse::Event::CursorEntered)
@ -324,13 +326,25 @@ where
) && cursor.is_over(c_layout.bounds())
{
my_state.hovered = Some(i);
return child.as_widget_mut().on_event(
state,
event.clone(),
c_layout.with_virtual_offset(layout.virtual_offset()),
cursor_virtual,
renderer,
clipboard,
shell,
viewport,
);
} else if my_state.hovered.is_some_and(|h| i != h) {
cursor_virtual = mouse::Cursor::Unavailable;
}
child.as_widget_mut().on_event(
state,
event.clone(),
c_layout.with_virtual_offset(layout.virtual_offset()),
cursor,
cursor_virtual,
renderer,
clipboard,
shell,
@ -376,18 +390,21 @@ where
viewport: &Rectangle,
) {
if let Some(clipped_viewport) = layout.bounds().intersection(viewport) {
let my_state = tree.state.downcast_ref::<State>();
let viewport = if self.clip {
&clipped_viewport
} else {
viewport
};
for ((child, state), c_layout) in self
for (i, ((child, state), c_layout)) in self
.children
.iter()
.zip(&tree.children)
.zip(layout.children())
.filter(|(_, layout)| layout.bounds().intersects(viewport))
.enumerate()
{
child.as_widget().draw(
state,
@ -395,7 +412,11 @@ where
theme,
style,
c_layout.with_virtual_offset(layout.virtual_offset()),
cursor,
if my_state.hovered.is_some_and(|h| i == h) {
cursor
} else {
mouse::Cursor::Unavailable
},
viewport,
);
}