Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix clickable widgets blocking scrolling on touch screens #3815

Merged
merged 3 commits into from
Jan 15, 2024
Merged

Fix clickable widgets blocking scrolling on touch screens #3815

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86cb281
Fix clickable widgets blocking scrolling on touch screens
lucasmerlin Jul 6, 2023
c758028
Create WidgetRect struct
lucasmerlin Jan 15, 2024
2bfe855
change what-comment to why-comment
emilk Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions crates/egui/src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ impl ContextImpl {

// ----------------------------------------------------------------------------

/// Used to store each widgets [Id], [Rect] and [Sense] each frame.
/// Used to check for overlaps between widgets when handling events.
struct WidgetRect {
id: Id,
rect: Rect,
sense: Sense,
}

/// State stored per viewport
#[derive(Default)]
struct ViewportState {
Expand All @@ -138,10 +146,10 @@ struct ViewportState {
used: bool,

/// Written to during the frame.
layer_rects_this_frame: HashMap<LayerId, Vec<(Id, Rect)>>,
layer_rects_this_frame: HashMap<LayerId, Vec<WidgetRect>>,

/// Read
layer_rects_prev_frame: HashMap<LayerId, Vec<(Id, Rect)>>,
layer_rects_prev_frame: HashMap<LayerId, Vec<WidgetRect>>,

/// State related to repaint scheduling.
repaint: ViewportRepaintInfo,
Expand Down Expand Up @@ -865,17 +873,29 @@ impl Context {
.layer_rects_this_frame
.entry(layer_id)
.or_default()
.push((id, interact_rect));
.push(WidgetRect {
id,
rect: interact_rect,
sense,
});

if hovered {
let pointer_pos = viewport.input.pointer.interact_pos();
if let Some(pointer_pos) = pointer_pos {
if let Some(rects) = viewport.layer_rects_prev_frame.get(&layer_id) {
for &(prev_id, prev_rect) in rects.iter().rev() {
for &WidgetRect {
id: prev_id,
rect: prev_rect,
sense: prev_sense,
} in rects.iter().rev()
{
if prev_id == id {
break; // there is no other interactive widget covering us at the pointer position.
}
if prev_rect.contains(pointer_pos) {
// We don't want a click-only button to block drag-events to a `ScrollArea`:
let has_conflicting_sense = (prev_sense.click && sense.click)
|| (prev_sense.drag && sense.drag);
if prev_rect.contains(pointer_pos) && has_conflicting_sense {
// Another interactive widget is covering us at the pointer position,
// so we aren't hovered.

Expand Down
Loading