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

Allow overlapping interactive widgets #2244

Merged
merged 11 commits into from
Nov 7, 2022
Merged

Allow overlapping interactive widgets #2244

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ca34602
Turn off optimization for debug builds again
emilk Nov 5, 2022
bd17c3d
Optimize rect_contains_pointer
emilk Nov 5, 2022
ee73f80
Fix for colorpicker: make popup immovable
emilk Nov 5, 2022
d5546a6
Area: interact first
emilk Nov 5, 2022
6a4bef0
ScrollArea: do interaction first
emilk Nov 5, 2022
d11b265
Window: shrink double-clickable area of titelbar
emilk Nov 5, 2022
0bcaf24
Only the top-most (latest added) interactive widget gets `hovered=true`
emilk Nov 5, 2022
c5e044d
Add Frame::total_margin
emilk Nov 6, 2022
345cc52
Update changelog
emilk Nov 7, 2022
601f1f1
Merge branch 'master' into overlapping-widgets
emilk Nov 7, 2022
872640b
Add debug-options to visualize what widgets cover which other widget
emilk Nov 7, 2022
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
Prev Previous commit
Next Next commit
Optimize rect_contains_pointer
  • Loading branch information
@emilk
emilk committed Nov 5, 2022
commit bd17c3d2c5b4d08498de5ab8984c596f84d2b2f7
12 changes: 7 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 @@ -1089,11 +1089,13 @@ impl Context {
}

pub(crate) fn rect_contains_pointer(&self, layer_id: LayerId, rect: Rect) -> bool {
let pointer_pos = self.input().pointer.interact_pos();
if let Some(pointer_pos) = pointer_pos {
rect.contains(pointer_pos) && self.layer_id_at(pointer_pos) == Some(layer_id)
} else {
false
rect.is_positive() && {
let pointer_pos = self.input().pointer.interact_pos();
if let Some(pointer_pos) = pointer_pos {
rect.contains(pointer_pos) && self.layer_id_at(pointer_pos) == Some(layer_id)
} else {
false
}
}
}

Expand Down