From e53b9f5ccf6f26bf41afc5efd900e5ef3835aaac Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 12 Dec 2023 17:40:22 +0100 Subject: [PATCH] Fix Div::active not working Somehow a condition got inverted and caused the bug. --- crates/gpui2/src/elements/div.rs | 2 +- crates/storybook2/src/stories/focus.rs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs index 22ae154ca8286bac0d9e78910e7363f7678078ca..076afa8db73e49169b4006ad320dc0ae96484900 100644 --- a/crates/gpui2/src/elements/div.rs +++ b/crates/gpui2/src/elements/div.rs @@ -984,7 +984,7 @@ impl Interactivity { } let active_state = element_state.clicked_state.clone(); - if !active_state.borrow().is_clicked() { + if active_state.borrow().is_clicked() { cx.on_mouse_event(move |_: &MouseUpEvent, phase, cx| { if phase == DispatchPhase::Capture { *active_state.borrow_mut() = ElementClickedState::default(); diff --git a/crates/storybook2/src/stories/focus.rs b/crates/storybook2/src/stories/focus.rs index 6dc81876900bdafae4b5de8dc19653b8b8e4edf4..a3a8845947ddd1f78e57991aa701489087cc2033 100644 --- a/crates/storybook2/src/stories/focus.rs +++ b/crates/storybook2/src/stories/focus.rs @@ -66,9 +66,11 @@ impl Render for FocusStory { let color_4 = theme.status().conflict; let color_5 = theme.status().ignored; let color_6 = theme.status().renamed; + let color_7 = theme.status().hint; div() .id("parent") + .active(|style| style.bg(color_7)) .track_focus(&self.parent_focus) .key_context("parent") .on_action(cx.listener(|_, _action: &ActionA, _cx| {