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

button: Fix the on_hover does not respond (#1346)

Browse source
This commit is contained in:
Floyd Wang 2025-10-10 10:52:05 +08:00 committed by GitHub
parent 9d01ac26bc
commit d4b0aff534
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/ui/src/button/button.rs
View file

@ -358,6 +358,16 @@ impl Button {
self.tab_stop = tab_stop; self.tab_stop = tab_stop;
self self
} }
#[inline]
fn clickable(&self) -> bool {
!(self.disabled || self.loading) && self.on_click.is_some()
}
#[inline]
fn hoverable(&self) -> bool {
!(self.disabled || self.loading) && self.on_hover.is_some()
}
} }
impl Disableable for Button { impl Disableable for Button {
@ -413,7 +423,8 @@ impl InteractiveElement for Button {
impl RenderOnce for Button { impl RenderOnce for Button {
fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement { fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
let style: ButtonVariant = self.variant; let style: ButtonVariant = self.variant;
let clickable = !(self.disabled || self.loading) && self.on_click.is_some(); let clickable = self.clickable();
let hoverable = self.hoverable();
let normal_style = style.normal(self.outline, cx); let normal_style = style.normal(self.outline, cx);
let icon_size = match self.size { let icon_size = match self.size {
Size::Size(v) => Size::Size(v * 0.75), Size::Size(v) => Size::Size(v * 0.75),
@ -534,7 +545,7 @@ impl RenderOnce for Button {
(on_click)(event, window, cx); (on_click)(event, window, cx);
}) })
}) })
.when_some(self.on_hover.filter(|_| clickable), |this, on_hover| { .when_some(self.on_hover.filter(|_| hoverable), |this, on_hover| {
this.on_hover(move |hovered, window, cx| { this.on_hover(move |hovered, window, cx| {
(on_hover)(hovered, window, cx); (on_hover)(hovered, window, cx);
}) })