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

menu: Respect output bounds

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-12-08 17:52:44 +00:00 • committed by Victoria Brekenfeld
parent 02a6290067
commit 131ab8fe9e
2 changed files with 90 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/shell/grabs/menu/item.rs
View file

@ -158,21 +158,27 @@ where
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) -> event::Status {
let is_over = cursor.is_over(layout.bounds());
let mut bounds = layout.bounds();
// fix padding 1 and event... don't ask.
bounds.x -= 1.;
bounds.width += 2.;
let is_over = cursor.is_over(bounds);
let widget_state = state.state.downcast_mut::<State>();
match event {
Event::Mouse(mouse::Event::CursorEntered)
| Event::Mouse(mouse::Event::CursorMoved { .. })
if is_over && !widget_state.cursor_over =>
{
shell.publish(Message::cursor_entered(self.idx, layout.bounds()));
shell.publish(Message::cursor_entered(self.idx, bounds));
widget_state.cursor_over = true;
}
Event::Mouse(mouse::Event::CursorMoved { .. })
| Event::Mouse(mouse::Event::CursorLeft)
if !is_over && widget_state.cursor_over =>
{
shell.publish(Message::cursor_left(self.idx, layout.bounds()));
shell.publish(Message::cursor_left(self.idx, bounds));
widget_state.cursor_over = false;
}
_ => {}