migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 22:30:03 -04:00
Code Activity

Don't hover things under tooltips

Browse Source
This commit is contained in:
Emil Ernerfeldt
2024-06-10 13:22:35 +02:00
parent e2a127a381
commit ee22145779
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/egui/src/containers/area.rs
View File

@@ -24,9 +24,6 @@ pub struct AreaState {
/// Last known size. /// Last known size.
pub size: Vec2, pub size: Vec2,
/// If false, clicks goes straight through to what is behind us. Useful for tooltips etc.
pub interactable: bool,
/// At what time was this area first shown? /// At what time was this area first shown?
/// ///
/// Used to fade in the area. /// Used to fade in the area.
@@ -397,12 +394,10 @@ impl Area {
pivot_pos: default_pos.unwrap_or_else(|| automatic_area_position(ctx)), pivot_pos: default_pos.unwrap_or_else(|| automatic_area_position(ctx)),
pivot, pivot,
size, size,
interactable,
last_became_visible_at: ctx.input(|i| i.time), last_became_visible_at: ctx.input(|i| i.time),
} }
}); });
state.pivot_pos = new_pos.unwrap_or(state.pivot_pos); state.pivot_pos = new_pos.unwrap_or(state.pivot_pos);
state.interactable = interactable;
// TODO(emilk): if last frame was sizing pass, it should be considered invisible for smmother fade-in // TODO(emilk): if last frame was sizing pass, it should be considered invisible for smmother fade-in
let visible_last_frame = ctx.memory(|mem| mem.areas().visible_last_frame(&layer_id)); let visible_last_frame = ctx.memory(|mem| mem.areas().visible_last_frame(&layer_id));

1
crates/egui/src/context.rs
View File

@@ -498,7 +498,6 @@ impl ContextImpl {
pivot_pos: screen_rect.left_top(), pivot_pos: screen_rect.left_top(),
pivot: Align2::LEFT_TOP, pivot: Align2::LEFT_TOP,
size: screen_rect.size(), size: screen_rect.size(),
interactable: true,
last_became_visible_at: f64::NEG_INFINITY, last_became_visible_at: f64::NEG_INFINITY,
}, },
); );

13
crates/egui/src/memory.rs
View File

@@ -994,14 +994,13 @@ impl Areas {
if self.is_visible(layer) { if self.is_visible(layer) {
if let Some(state) = self.areas.get(&layer.id) { if let Some(state) = self.areas.get(&layer.id) {
let mut rect = state.rect(); let mut rect = state.rect();
if state.interactable {
if let Some(transform) = layer_transforms.get(layer) {
rect = *transform * rect;
}
if rect.contains(pos) { if let Some(transform) = layer_transforms.get(layer) {
return Some(*layer); rect = *transform * rect;
} }
if rect.contains(pos) {
return Some(*layer);
} }
} }
} }

7
crates/egui_demo_lib/src/demo/tooltips.rs
View File

@@ -81,5 +81,12 @@ impl super::View for Tooltips {
.on_hover_ui(tooltip_ui) .on_hover_ui(tooltip_ui)
.on_disabled_hover_ui(disabled_tooltip_ui); .on_disabled_hover_ui(disabled_tooltip_ui);
}); });
ui.separator(); // ---------------------------------------------------------
ui.label("This widget has a tooltip that fills the screen")
.on_hover_ui(|ui| {
ui.allocate_exact_size(ui.ctx().screen_rect().size() * 0.8, egui::Sense::hover());
});
} }
} }