leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Fix moving floating windows with touch

Browse source
This commit is contained in:
Ian Douglas Scott 2024-04-05 16:43:07 -07:00 • committed by Victoria Brekenfeld
parent bddfba464c
commit 2961291d26
1 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/shell/grabs/moving.rs
View file

@ -704,19 +704,17 @@ impl Drop for MoveGrab {
let window_outputs = self.window_outputs.drain().collect::<HashSet<_>>(); let window_outputs = self.window_outputs.drain().collect::<HashSet<_>>();
let previous = self.previous; let previous = self.previous;
let window = self.window.clone(); let window = self.window.clone();
let is_touch_grab = matches!(self.start_data, GrabStartData::Touch(_));
let _ = self.evlh.0.insert_idle(move |state| { let _ = self.evlh.0.insert_idle(move |state| {
let pointer = seat.get_pointer().unwrap();
let position: Option<(CosmicMapped, Point<i32, Global>)> = if let Some(grab_state) = let position: Option<(CosmicMapped, Point<i32, Global>)> = if let Some(grab_state) =
seat.user_data() seat.user_data()
.get::<SeatMoveGrabState>() .get::<SeatMoveGrabState>()
.and_then(|s| s.borrow_mut().take()) .and_then(|s| s.borrow_mut().take())
{ {
if grab_state.window.alive() { if grab_state.window.alive() {
let window_location = (pointer.current_location().to_i32_round() let window_location =
+ grab_state.window_offset) (grab_state.location.to_i32_round() + grab_state.window_offset).as_global();
.as_global();
let workspace_handle = state.common.shell.active_space(&output).handle; let workspace_handle = state.common.shell.active_space(&output).handle;
for old_output in window_outputs.iter().filter(|o| *o != &output) { for old_output in window_outputs.iter().filter(|o| *o != &output) {
@ -826,23 +824,26 @@ impl Drop for MoveGrab {
if let Some((mapped, position)) = position { if let Some((mapped, position)) = position {
let serial = SERIAL_COUNTER.next_serial(); let serial = SERIAL_COUNTER.next_serial();
let current_location = pointer.current_location(); if !is_touch_grab {
let pointer = seat.get_pointer().unwrap();
let current_location = pointer.current_location();
if let Some((target, offset)) = if let Some((target, offset)) =
mapped.focus_under(current_location - position.as_logical().to_f64()) mapped.focus_under(current_location - position.as_logical().to_f64())
{ {
pointer.motion( pointer.motion(
state, state,
Some(( Some((
target, target,
position.as_logical() - window.geometry().loc + offset, position.as_logical() - window.geometry().loc + offset,
)), )),
&MotionEvent { &MotionEvent {
location: pointer.current_location(), location: pointer.current_location(),
serial, serial,
time: 0, time: 0,
}, },
); );
}
} }
Common::set_focus( Common::set_focus(
state, state,