Skip to content

Fix for Issue #1894 - Subsurface position is not updated by parent surface commit #1975

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
paul-dev8 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for Issue #1894 - Subsurface position is not updated by parent surface commit #1975

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
11 changes: 10 additions & 1 deletion src/wayland/compositor/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,16 @@ impl PrivateSurfaceData {
let child_tx = std::mem::take(&mut child_data.pending_transaction);
child_tx.merge_into(&my_data.pending_transaction);
child_data.current_txid.0 = child_data.current_txid.0.wrapping_add(1);
}
} else {
+ // Desync child with non-sync parent: per Wayland protocol spec,
+ // wl_subsurface.set_position "is applied when the parent surface's
+ // wl_surface.commit is called." Commit with None to apply pending
+ // state directly to current (bypassing the transaction queue).
+ // This is safe because desync subsurface buffer state is already
+ // applied on the child's own commit — only SubsurfaceCachedState
+ // (position) has pending changes from set_position. (smithay#1894)
+ child_data.public_data.cached_state.commit(None, dh);
}
}
my_data
.pending_transaction
Expand Down