Skip to content

Fix edge case offset handling in surface tree traversals #1954

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

Open
moggiesir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix edge case offset handling in surface tree traversals #1954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions src/desktop/wayland/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,15 @@ where
with_surface_tree_downward(
surface,
location,
|_, states, loc: &Point<i32, Logical>| {
|wl_surface, states, loc: &Point<i32, Logical>| {
let mut loc = *loc;
let data = states.data_map.get::<RendererSurfaceStateUserData>();

if let Some(surface_view) = data.and_then(|d| d.lock().unwrap().surface_view) {
loc += surface_view.offset;
// Assume the location parameter provides the root location.
if wl_surface != surface {
loc += surface_view.offset;
}
// Update the bounding box.
bounding_box = bounding_box.merge(Rectangle::new(loc, surface_view.dst));

Expand Down Expand Up @@ -104,12 +107,15 @@ where
with_surface_tree_downward(
surface,
location.into(),
|_, states, location: &Point<i32, Logical>| {
|wl_surface, states, location: &Point<i32, Logical>| {
let mut location = *location;
let data = states.data_map.get::<RendererSurfaceStateUserData>();

if let Some(surface_view) = data.and_then(|d| d.lock().unwrap().surface_view) {
location += surface_view.offset;
// Assume the location parameter provides the surface location.
if wl_surface != surface {
location += surface_view.offset;
}
if surface_type.contains(WindowSurfaceType::SUBSURFACE) {
TraversalAction::DoChildren(location)
} else {
Expand All @@ -125,7 +131,9 @@ where
let data = states.data_map.get::<RendererSurfaceStateUserData>();

if let Some(surface_view) = data.and_then(|d| d.lock().unwrap().surface_view) {
location += surface_view.offset;
if wl_surface != surface {
location += surface_view.offset;
}

let contains_the_point = data
.map(|data| {
Expand Down