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

Migrate away from Rectangle::from_loc_and_size

Browse source 
Deprecated in `smithay` by https://github.com/Smithay/smithay/pull/1621.
This commit is contained in:
Ian Douglas Scott 2024-12-26 18:18:35 -08:00 • committed by Victoria Brekenfeld
parent 9074447c4f
commit b685512127
26 changed files with 184 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,7 @@ impl ResizeSurfaceGrab {
self.last_window_size = (new_window_width, new_window_height).into();
self.window.set_resizing(true);
self.window.set_geometry(Rectangle::from_loc_and_size(
self.window.set_geometry(Rectangle::new(
if let Some(s) = self.window.active_window().x11_surface() {
s.geometry().loc.as_global()
} else {
@ -523,7 +523,7 @@ impl ResizeSurfaceGrab {
}
self.window.set_resizing(false);
self.window.set_geometry(Rectangle::from_loc_and_size(
self.window.set_geometry(Rectangle::new(
if let Some(x11_surface) = self.window.active_window().x11_surface() {
x11_surface.geometry().loc.as_global()
} else {

17
src/shell/layout/floating/mod.rs
View file

@ -257,7 +257,7 @@ impl TiledCorners {
),
};
Rectangle::from_loc_and_size(loc, size).as_local()
Rectangle::new(loc, size).as_local()
}
}
@ -463,9 +463,9 @@ impl FloatingLayout {
&& output_geometry.contains_rect(*geo)
})
.map(|geometry| {
let mut geometry: Rectangle<u32, Logical> = Rectangle::from_loc_and_size(
(geometry.loc.x as u32, geometry.loc.y as u32),
(geometry.size.w as u32, geometry.size.h as u32),
let mut geometry: Rectangle<u32, Logical> = Rectangle::new(
(geometry.loc.x as u32, geometry.loc.y as u32).into(),
(geometry.size.w as u32, geometry.size.h as u32).into(),
);
// move down
@ -572,8 +572,7 @@ impl FloatingLayout {
});
mapped.set_tiled(false);
mapped
.set_geometry(Rectangle::from_loc_and_size(position, win_geo.size).to_global(&output));
mapped.set_geometry(Rectangle::new(position, win_geo.size).to_global(&output));
mapped.configure();
if let Some(previous_geometry) = prev.or(already_mapped) {
@ -604,7 +603,7 @@ impl FloatingLayout {
mapped.set_geometry(geometry.to_global(&output));
mapped.configure();
} else {
mapped.set_geometry(Rectangle::from_loc_and_size(
mapped.set_geometry(Rectangle::new(
position.to_global(&output),
window_size.as_global(),
));
@ -633,7 +632,7 @@ impl FloatingLayout {
if let Some(location) = self.space.element_location(window) {
window.set_tiled(false);
window.set_geometry(
Rectangle::from_loc_and_size(location, last_size.as_logical())
Rectangle::new(location, last_size.as_logical())
.as_local()
.to_global(self.space.outputs().next().unwrap()),
);
@ -644,7 +643,7 @@ impl FloatingLayout {
} else if !window.is_maximized(true) && !window.is_fullscreen(true) {
if let Some(location) = self.space.element_location(window) {
*window.last_geometry.lock().unwrap() = Some(
Rectangle::from_loc_and_size(
Rectangle::new(
location,
window
.pending_size()