From 36bca4f0d6ff323bcbae46f3487264de61e2bd41 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Thu, 12 Oct 2023 16:56:48 -0400 Subject: [PATCH] Restore click events on `Button`s using `on_mouse_down` --- crates/ui2/src/elements/button.rs | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/crates/ui2/src/elements/button.rs b/crates/ui2/src/elements/button.rs index 532a4624b6d9054ae1162cafa878ddab163816c0..bc5aaf1e5363129b0ccffcd14183cd92eceba0df 100644 --- a/crates/ui2/src/elements/button.rs +++ b/crates/ui2/src/elements/button.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use std::sync::Arc; -use gpui3::{DefiniteLength, Hsla, WindowContext}; +use gpui3::{DefiniteLength, Hsla, Interactive, MouseButton, WindowContext}; use crate::prelude::*; use crate::{h_stack, theme, Icon, IconColor, IconElement, Label, LabelColor, LabelSize}; @@ -195,20 +195,11 @@ impl Button { el = el.w(width).justify_center(); } - // el.when_some(self.handlers.click.clone(), |el, click_handler| { - // el.id(0) - // .on_click(MouseButton::Left, move |state, event, cx| { - // click_handler(state, cx); - // }) - // }); - - // if let Some(click_handler) = self.handlers.click.clone() { - // el = el - // .id(0) - // .on_click(MouseButton::Left, move |state, event, cx| { - // click_handler(state, cx); - // }); - // } + if let Some(click_handler) = self.handlers.click.clone() { + el = el.on_mouse_down(MouseButton::Left, move |state, event, cx| { + click_handler(state, cx); + }); + } el }