Skip to content

shell/grabs: Adjust reactive popups when window is moved #1369

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

shell/grabs: Adjust reactive popups when window is moved #1369

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
29 changes: 27 additions & 2 deletions src/shell/grabs/moving.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::{
},
focus::target::{KeyboardFocusTarget, PointerFocusTarget},
layout::floating::TiledCorners,
CosmicMapped, CosmicSurface, Direction, ManagedLayer,
CosmicMapped, CosmicSurface, Direction, ManagedLayer, WindowSurface,
},
utils::prelude::*,
wayland::protocols::toplevel_info::{toplevel_enter_output, toplevel_enter_workspace},
Expand Down Expand Up @@ -490,7 +490,32 @@ impl PointerGrab<State> for MoveGrab {
event: &MotionEvent,
) {
self.update_location(state, event.location);

{
let mut borrow = self
.seat
.user_data()
.get::<SeatMoveGrabState>()
.map(|s| s.lock().unwrap());
if let Some(grab_state) = borrow.as_mut().and_then(|s| s.as_mut()) {
// this is the global location
let location =
grab_state.window_offset.as_global().to_f64() + grab_state.location.as_global();
for (window, offset) in self.window.windows() {
match window.0.underlying_surface() {
WindowSurface::Wayland(toplevel) => {
update_reactive_popups(
toplevel,
// round() is used for consistency with fractional scaling
(location + offset.as_global().to_f64()).to_i32_round(),
self.window_outputs.iter(),
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The outputs are for finding the anchor point and the anchor point must be within the surface, so it will be within the same outputs as the window, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The outputs are for figuring out, which output contains the toplevel/popup to constrain that accordingly (and not let them go off-screen). window_outputs should be fine here, as they contain every output the window currently overlaps with. 👍

);
}
// X11 surfaces have access to the global coordinate space unlike wayland clients, so they do the re-adjustment themselves.
_ => {}
}
}
}
}
// While the grab is active, no client has pointer focus
handle.motion(state, None, event);
if !self.window.alive() {
Expand Down