skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add `Response::contains_pointer` (#3859) 

* Part of https://github.com/emilk/egui/issues/3841
This commit is contained in:
Emil Ernerfeldt 2024-01-22 11:17:03 +01:00 committed by GitHub
parent 894a53488a
commit 2d725d157f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/egui/src/response.rs
View File

@ -212,7 +212,9 @@ impl Response {
/// The pointer is hovering above this widget or the widget was clicked/tapped this frame. /// The pointer is hovering above this widget or the widget was clicked/tapped this frame.
/// ///
/// Note that this is slightly different from checking `response.rect.contains(pointer_pos)`. /// This will be `false` whenever some other widget is being dragged.
///
/// Note that this is slightly different from [`Self::contains_pointer`].
/// For one, the hover rectangle is slightly larger, by half of the current item spacing /// For one, the hover rectangle is slightly larger, by half of the current item spacing
/// (to make it easier to click things). But `hovered` also checks that no other area /// (to make it easier to click things). But `hovered` also checks that no other area
/// is covering this response rectangle. /// is covering this response rectangle.
@ -221,6 +223,17 @@ impl Response {
self.hovered self.hovered
} }
/// Returns true if the pointer is contained by the response rect.
///
/// In contrast to [`Self::hovered`], this can be `true` even if some other widget is being dragged.
/// This means it is useful for styling things like drag-and-drop targets.
///
/// In contrast to [`Self::hovered`], this is true even when dragging some other widget
/// onto this one.
pub fn contains_pointer(&self) -> bool {
self.ctx.rect_contains_pointer(self.layer_id, self.rect)
}
/// The widget is highlighted via a call to [`Self::highlight`] or [`Context::highlight_widget`]. /// The widget is highlighted via a call to [`Self::highlight`] or [`Context::highlight_widget`].
#[doc(hidden)] #[doc(hidden)]
pub fn highlighted(&self) -> bool { pub fn highlighted(&self) -> bool {

20
crates/egui_demo_lib/src/demo/drag_and_drop.rs
View File

@ -49,11 +49,14 @@ pub fn drop_target<R>(
let outer_rect = Rect::from_min_max(outer_rect_bounds.min, content_ui.min_rect().max + margin); let outer_rect = Rect::from_min_max(outer_rect_bounds.min, content_ui.min_rect().max + margin);
let (rect, response) = ui.allocate_at_least(outer_rect.size(), Sense::hover()); let (rect, response) = ui.allocate_at_least(outer_rect.size(), Sense::hover());
let style = if is_being_dragged && can_accept_what_is_being_dragged && response.hovered() { // NOTE: we use `response.contains_pointer` here instead of `hovered`, because
ui.visuals().widgets.active // `hovered` is always false when another widget is being dragged.
} else { let style =
ui.visuals().widgets.inactive if is_being_dragged && can_accept_what_is_being_dragged && response.contains_pointer() {
}; ui.visuals().widgets.active
} else {
ui.visuals().widgets.inactive
};
let mut fill = style.bg_fill; let mut fill = style.bg_fill;
let mut stroke = style.bg_stroke; let mut stroke = style.bg_stroke;
@ -149,7 +152,12 @@ impl super::View for DragAndDropDemo {
}); });
let is_being_dragged = ui.memory(|mem| mem.is_anything_being_dragged()); let is_being_dragged = ui.memory(|mem| mem.is_anything_being_dragged());
if is_being_dragged && can_accept_what_is_being_dragged && response.hovered() { // NOTE: we use `response.contains_pointer` here instead of `hovered`, because
// `hovered` is always false when another widget is being dragged.
if is_being_dragged
&& can_accept_what_is_being_dragged
&& response.contains_pointer()
{
drop_col = Some(col_idx); drop_col = Some(col_idx);
} }
} }