dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

menu: Better handle hover for menu item. (#1332)

Browse source 
Follow #1328 to improve again.
This commit is contained in:
Jason Lee 2025-10-08 10:17:08 +08:00 committed by GitHub
parent d0396d779e
commit c579db975f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/ui/src/menu/menu_item.rs
View file

@ -1,8 +1,8 @@
use crate::{h_flex, ActiveTheme, Disableable, Selectable, StyledExt};
use gpui::{
prelude::FluentBuilder as _, AnyElement, App, ClickEvent, ElementId, InteractiveElement,
IntoElement, MouseButton, MouseMoveEvent, ParentElement, RenderOnce,
StatefulInteractiveElement as _, StyleRefinement, Styled, Window,
IntoElement, MouseButton, ParentElement, RenderOnce, StatefulInteractiveElement as _,
StyleRefinement, Styled, Window,
};
use smallvec::SmallVec;
@ -14,7 +14,7 @@ pub struct MenuItem {
selected: bool,
hovered: bool,
on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
on_mouse_enter: Option<Box<dyn Fn(&MouseMoveEvent, &mut Window, &mut App) + 'static>>,
on_hover: Option<Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>>,
children: SmallVec<[AnyElement; 2]>,
}
@ -28,7 +28,7 @@ impl MenuItem {
selected: false,
hovered: false,
on_click: None,
on_mouse_enter: None,
on_hover: None,
children: SmallVec::new(),
}
}
@ -59,11 +59,8 @@ impl MenuItem {
/// Set a handler for when the mouse enters the MenuItem.
#[allow(unused)]
pub fn on_mouse_enter(
mut self,
handler: impl Fn(&MouseMoveEvent, &mut Window, &mut App) + 'static,
) -> Self {
self.on_mouse_enter = Some(Box::new(handler));
pub fn on_hover(mut self, handler: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
self.on_hover = Some(Box::new(handler));
self
}
}
@ -111,8 +108,8 @@ impl RenderOnce for MenuItem {
.items_center()
.justify_between()
.refine_style(&self.style)
.when_some(self.on_mouse_enter, |this, on_mouse_enter| {
this.on_mouse_move(move |ev, window, cx| (on_mouse_enter)(ev, window, cx))
.when_some(self.on_hover, |this, on_hover| {
this.on_hover(move |hovered, window, cx| (on_hover)(hovered, window, cx))
})
.when(!self.disabled, |this| {
this.when(self.hovered, |this| {

11
crates/ui/src/menu/popup_menu.rs
View file

@ -831,12 +831,15 @@ impl PopupMenu {
.rounded(radius)
.items_center()
.hovered(selected)
.on_mouse_enter(cx.listener(move |this, _, _, cx| {
if this.selected_index == Some(ix) {
return;
.on_hover(cx.listener(move |this, hovered, _, cx| {
if *hovered {
this.selected_index = Some(ix);
} else {
if this.selected_index == Some(ix) {
this.selected_index = None;
}
}
this.selected_index = Some(ix);
cx.notify();
}));