From 41fc30f62e733b11c863c52ce15586d96146f9d5 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Wed, 6 Dec 2023 16:29:35 -0500 Subject: [PATCH] Always show tooltips on buttons (#3521) This PR fixes an issue where tooltips weren't being shown on selected buttons. We now always show tooltips on buttons that have one. Release Notes: - N/A --- crates/ui2/src/components/button/button_like.rs | 6 +----- crates/ui2/src/components/stories/icon_button.rs | 8 ++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/crates/ui2/src/components/button/button_like.rs b/crates/ui2/src/components/button/button_like.rs index 4bef6bff774571047dd1519c18b7ec61b32f1904..1a33eb2845eef9e767181bb2cc5f65ba7eb8957f 100644 --- a/crates/ui2/src/components/button/button_like.rs +++ b/crates/ui2/src/components/button/button_like.rs @@ -359,11 +359,7 @@ impl RenderOnce for ButtonLike { }, ) .when_some(self.tooltip, |this, tooltip| { - if !self.selected { - this.tooltip(move |cx| tooltip(cx)) - } else { - this - } + this.tooltip(move |cx| tooltip(cx)) }) .children(self.children) } diff --git a/crates/ui2/src/components/stories/icon_button.rs b/crates/ui2/src/components/stories/icon_button.rs index 3c4d68f8aff5500225be0f6cf83c096a5c6c6dff..583f453d188b9df5aaaf71b5bb1897814c0a6f51 100644 --- a/crates/ui2/src/components/stories/icon_button.rs +++ b/crates/ui2/src/components/stories/icon_button.rs @@ -51,5 +51,13 @@ impl Render for IconButtonStory { .tooltip(|cx| Tooltip::text("Open messages", cx)), ), ) + .child(Story::label("Selected with `tooltip`")) + .child( + div().w_8().child( + IconButton::new("selected_with_tooltip", Icon::InlayHint) + .selected(true) + .tooltip(|cx| Tooltip::text("Toggle inlay hints", cx)), + ), + ) } }