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

shell/grabs: Fix resize geometry

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-01-25 18:43:22 +01:00
parent 1f3f1331ab
commit 34068d9514
1 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/shell/layout/floating/grabs/resize.rs
View file

@ -98,7 +98,10 @@ impl PointerGrab<State> for ResizeSurfaceGrab {
self.window.set_resizing(true); self.window.set_resizing(true);
self.window.set_geometry(Rectangle::from_loc_and_size( self.window.set_geometry(Rectangle::from_loc_and_size(
self.window.geometry().loc, match self.window.active_window() {
CosmicSurface::X11(s) => s.geometry().loc,
_ => (0, 0).into(),
},
self.last_window_size, self.last_window_size,
)); ));
self.window.configure(); self.window.configure();
@ -122,7 +125,10 @@ impl PointerGrab<State> for ResizeSurfaceGrab {
self.window.set_resizing(false); self.window.set_resizing(false);
self.window.set_geometry(Rectangle::from_loc_and_size( self.window.set_geometry(Rectangle::from_loc_and_size(
self.window.geometry().loc, match self.window.active_window() {
CosmicSurface::X11(s) => s.geometry().loc,
_ => (0, 0).into(),
},
self.last_window_size, self.last_window_size,
)); ));
self.window.configure(); self.window.configure();
@ -217,17 +223,22 @@ impl ResizeSurfaceGrab {
if let Some(new_location) = new_location { if let Some(new_location) = new_location {
for (window, offset) in window.windows() { for (window, offset) in window.windows() {
if let CosmicSurface::Wayland(window) = window { match window {
update_reactive_popups( CosmicSurface::Wayland(window) => {
&window, update_reactive_popups(
new_location + offset, &window,
space.floating_layer.space.outputs(), new_location + offset,
); space.floating_layer.space.outputs(),
);
}
CosmicSurface::X11(surface) => {
let mut geometry = surface.geometry();
geometry.loc += location - new_location;
let _ = surface.configure(geometry);
}
_ => unreachable!(),
} }
} }
let mut geometry = window.geometry();
geometry.loc += location - new_location;
let _ = window.set_geometry(geometry);
space space
.floating_layer .floating_layer
.space .space