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

Update moving.rs

Browse source
This commit is contained in:
Daniel 2025-02-14 22:17:17 +11:00 • committed by Victoria Brekenfeld
parent 2553810621
commit 2bf74951ea
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -342,7 +342,7 @@ pub struct MoveGrab {
window_outputs: HashSet<Output>, window_outputs: HashSet<Output>,
previous: ManagedLayer, previous: ManagedLayer,
release: ReleaseMode, release: ReleaseMode,
window_snap_threshold: f64, edge_snap_threshold: f64,
// SAFETY: This is only used on drop which will always be on the main thread // SAFETY: This is only used on drop which will always be on the main thread
evlh: NotSend<LoopHandle<'static, State>>, evlh: NotSend<LoopHandle<'static, State>>,
} }
@ -396,21 +396,19 @@ impl MoveGrab {
let output_loc = output_geom.loc; let output_loc = output_geom.loc;
let output_size = output_geom.size; let output_size = output_geom.size;
grab_state.location.x = if (loc.x - output_loc.x).abs() < self.window_snap_threshold grab_state.location.x = if (loc.x - output_loc.x).abs() < self.edge_snap_threshold {
{
output_loc.x - grab_state.window_offset.x as f64 output_loc.x - grab_state.window_offset.x as f64
} else if ((loc.x + size.w) - (output_loc.x + output_size.w)).abs() } else if ((loc.x + size.w) - (output_loc.x + output_size.w)).abs()
< self.window_snap_threshold < self.edge_snap_threshold
{ {
output_loc.x + output_size.w - grab_state.window_offset.x as f64 - size.w output_loc.x + output_size.w - grab_state.window_offset.x as f64 - size.w
} else { } else {
grab_state.location.x grab_state.location.x
}; };
grab_state.location.y = if (loc.y - output_loc.y).abs() < self.window_snap_threshold grab_state.location.y = if (loc.y - output_loc.y).abs() < self.edge_snap_threshold {
{
output_loc.y - grab_state.window_offset.y as f64 output_loc.y - grab_state.window_offset.y as f64
} else if ((loc.y + size.h) - (output_loc.y + output_size.h)).abs() } else if ((loc.y + size.h) - (output_loc.y + output_size.h)).abs()
< self.window_snap_threshold < self.edge_snap_threshold
{ {
output_loc.y + output_size.h - grab_state.window_offset.y as f64 - size.h output_loc.y + output_size.h - grab_state.window_offset.y as f64 - size.h
} else { } else {
@ -716,7 +714,7 @@ impl MoveGrab {
initial_window_location: Point<i32, Global>, initial_window_location: Point<i32, Global>,
cursor_output: Output, cursor_output: Output,
indicator_thickness: u8, indicator_thickness: u8,
window_snap_threshold: f64, edge_snap_threshold: f64,
previous_layer: ManagedLayer, previous_layer: ManagedLayer,
release: ReleaseMode, release: ReleaseMode,
evlh: LoopHandle<'static, State>, evlh: LoopHandle<'static, State>,
@ -760,7 +758,7 @@ impl MoveGrab {
window_outputs: outputs, window_outputs: outputs,
previous: previous_layer, previous: previous_layer,
release, release,
window_snap_threshold, edge_snap_threshold,
evlh: NotSend(evlh), evlh: NotSend(evlh),
} }
} }