Give each tooltip area its own unique Id (#2264)

* Don't check for clicks on non-interactive areas * Give each tooltip area its own unique Id
emilk · Nov 8, 2022 · 51ff327 · 51ff327
1 parent 3521360
commit 51ff327
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/crates/egui/src/containers/area.rs b/crates/egui/src/containers/area.rs
@@ -236,8 +236,10 @@ impl Area {
             let interact_id = layer_id.id.with("move");
             let sense = if movable {
                 Sense::click_and_drag()
-            } else {
+            } else if interactable {
                 Sense::click() // allow clicks to bring to front
+            } else {
+                Sense::hover()
             };
 
             let move_response = ctx.interact(

diff --git a/crates/egui/src/containers/popup.rs b/crates/egui/src/containers/popup.rs
@@ -209,7 +209,8 @@ fn show_tooltip_at_avoid_dyn<'c, R>(
 
     let position = position.at_least(ctx.input().screen_rect().min);
 
-    let InnerResponse { inner, response } = show_tooltip_area_dyn(ctx, id, position, add_contents);
+    let InnerResponse { inner, response } =
+        show_tooltip_area_dyn(ctx, id.with(count), position, add_contents);
 
     state.set_tooltip_size(id, count, response.rect.size());
     state.store(ctx);