Skip to content

Commit b685512

Browse files
ids1024Drakulix
ids1024
authored and
Drakulix
committed
Migrate away from Rectangle::from_loc_and_size
Deprecated in `smithay` by Smithay/smithay#1621.
1 parent 9074447 commit b685512

File tree

26 files changed

+184
-201
lines changed

26 files changed

+184
-201
lines changed

‎src/backend/kms/surface/mod.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ impl MirroringState {
165165
.unwrap_or_default()
166166
.to_logical(1)
167167
.to_buffer(1, Transform::Normal);
168-
let opaque_regions = vec![Rectangle::from_loc_and_size((0, 0), size)];
168+
let opaque_regions = vec![Rectangle::from_size(size)];
169169

170170
let texture = Offscreen::<GlesTexture>::create_buffer(renderer, format, size)?;
171171
let transform = output.current_transform();
@@ -512,10 +512,8 @@ fn surface_thread(
512512

513513
#[cfg(feature = "debug")]
514514
let egui = {
515-
let state = smithay_egui::EguiState::new(smithay::utils::Rectangle::from_loc_and_size(
516-
(0, 0),
517-
(400, 800),
518-
));
515+
let state =
516+
smithay_egui::EguiState::new(smithay::utils::Rectangle::from_size((400, 800).into()));
519517
let mut visuals: egui::style::Visuals = Default::default();
520518
visuals.window_shadow = egui::Shadow::NONE;
521519
state.context().set_visuals(visuals);
@@ -1114,8 +1112,7 @@ impl SurfaceThreadState {
11141112
elements = constrain_render_elements(
11151113
std::iter::once(texture_elem),
11161114
(0, 0),
1117-
Rectangle::from_loc_and_size(
1118-
(0, 0),
1115+
Rectangle::from_size(
11191116
self.output
11201117
.geometry()
11211118
.size

‎src/backend/render/element.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ impl Element for DamageElement {
379379
}
380380

381381
fn src(&self) -> Rectangle<f64, BufferCoords> {
382-
Rectangle::from_loc_and_size((0.0, 0.0), (1.0, 1.0))
382+
Rectangle::from_size((1.0, 1.0).into())
383383
}
384384

385385
fn geometry(&self, scale: Scale<f64>) -> Rectangle<i32, Physical> {
@@ -391,10 +391,7 @@ impl Element for DamageElement {
391391
scale: Scale<f64>,
392392
_commit: Option<CommitCounter>,
393393
) -> DamageSet<i32, Physical> {
394-
DamageSet::from_slice(&[Rectangle::from_loc_and_size(
395-
(0, 0),
396-
self.geometry(scale).size,
397-
)])
394+
DamageSet::from_slice(&[Rectangle::from_size(self.geometry(scale).size).into()])
398395
}
399396
}
400397

‎src/backend/render/mod.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -681,11 +681,7 @@ where
681681
.as_logical()
682682
.to_physical_precise_round(scale);
683683
let crop_to_output = |element: WorkspaceRenderElement<R>| {
684-
CropRenderElement::from_element(
685-
element.into(),
686-
scale,
687-
Rectangle::from_loc_and_size((0, 0), output_size),
688-
)
684+
CropRenderElement::from_element(element.into(), scale, Rectangle::from_size(output_size))
689685
};
690686

691687
render_input_order(

‎src/input/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1955,7 +1955,7 @@ impl State {
19551955
let location = global_pos + offset.as_global().to_f64();
19561956
let output = workspace.output();
19571957
let output_geo = output.geometry().to_local(output);
1958-
if Rectangle::from_loc_and_size(offset.as_local(), output_geo.size)
1958+
if Rectangle::new(offset.as_local(), output_geo.size)
19591959
.intersection(output_geo)
19601960
.is_some_and(|geometry| {
19611961
geometry.contains(global_pos.to_local(output).to_i32_round())
@@ -1970,7 +1970,7 @@ impl State {
19701970
let location = global_pos + offset.as_global().to_f64();
19711971
let output = workspace.output();
19721972
let output_geo = output.geometry().to_local(output);
1973-
if Rectangle::from_loc_and_size(offset.as_local(), output_geo.size)
1973+
if Rectangle::new(offset.as_local(), output_geo.size)
19741974
.intersection(output_geo)
19751975
.is_some_and(|geometry| {
19761976
geometry.contains(global_pos.to_local(output).to_i32_round())

‎src/shell/element/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,12 @@ impl CosmicMapped {
226226
let win = stack.active();
227227
let location = stack.offset();
228228
let size = win.geometry().size;
229-
Rectangle::from_loc_and_size(location, size)
229+
Rectangle::new(location, size)
230230
}
231231
CosmicMappedInternal::Window(win) => {
232232
let location = win.offset();
233233
let size = win.geometry().size;
234-
Rectangle::from_loc_and_size(location, size)
234+
Rectangle::new(location, size)
235235
}
236236
_ => unreachable!(),
237237
}
@@ -601,9 +601,9 @@ impl CosmicMapped {
601601
pub fn set_debug(&self, flag: bool) {
602602
let mut debug = self.debug.lock().unwrap();
603603
if flag {
604-
*debug = Some(smithay_egui::EguiState::new(Rectangle::from_loc_and_size(
605-
(10, 10),
606-
(100, 100),
604+
*debug = Some(smithay_egui::EguiState::new(Rectangle::new(
605+
(10, 10).into(),
606+
(100, 100).into(),
607607
)));
608608
} else {
609609
debug.take();
@@ -662,7 +662,7 @@ impl CosmicMapped {
662662
window.geometry().size,
663663
);
664664

665-
let area = Rectangle::<i32, Logical>::from_loc_and_size(
665+
let area = Rectangle::<i32, Logical>::new(
666666
location.to_f64().to_logical(scale).to_i32_round(),
667667
self.bbox().size,
668668
);

‎src/shell/element/stack.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ impl CosmicStack {
491491
let loc = (geo.loc.x, geo.loc.y + TAB_HEIGHT);
492492
let size = (geo.size.w, geo.size.h - TAB_HEIGHT);
493493

494-
let win_geo = Rectangle::from_loc_and_size(loc, size);
494+
let win_geo = Rectangle::new(loc.into(), size.into());
495495
for window in p.windows.lock().unwrap().iter() {
496496
window.set_geometry(win_geo, TAB_HEIGHT as u32);
497497
}
@@ -1045,9 +1045,9 @@ impl Program for CosmicStackInternal {
10451045
theme: &Theme,
10461046
) {
10471047
if self.group_focused.load(Ordering::SeqCst) {
1048-
let border = Rectangle::from_loc_and_size(
1049-
(0, ((TAB_HEIGHT as f32 * scale) - scale).floor() as i32),
1050-
(pixels.width() as i32, scale.ceil() as i32),
1048+
let border = Rectangle::new(
1049+
(0, ((TAB_HEIGHT as f32 * scale) - scale).floor() as i32).into(),
1050+
(pixels.width() as i32, scale.ceil() as i32).into(),
10511051
);
10521052

10531053
let mut paint = tiny_skia::Paint::default();

‎src/shell/element/window.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl CosmicWindow {
214214
let loc = (geo.loc.x, geo.loc.y + ssd_height);
215215
let size = (geo.size.w, std::cmp::max(geo.size.h - ssd_height, 0));
216216
p.window
217-
.set_geometry(Rectangle::from_loc_and_size(loc, size), ssd_height as u32);
217+
.set_geometry(Rectangle::new(loc.into(), size.into()), ssd_height as u32);
218218
});
219219
}
220220

‎src/shell/grabs/menu/mod.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ impl Program for ContextMenu {
249249
let output = seat.active_output();
250250
let position = [
251251
// to the right -> down
252-
Rectangle::from_loc_and_size(
252+
Rectangle::new(
253253
position
254254
+ Point::from((
255255
bounds.width.ceil() as i32,
@@ -258,7 +258,7 @@ impl Program for ContextMenu {
258258
min_size.as_global(),
259259
),
260260
// to the right -> up
261-
Rectangle::from_loc_and_size(
261+
Rectangle::new(
262262
position
263263
+ Point::from((
264264
bounds.width.ceil() as i32,
@@ -268,12 +268,12 @@ impl Program for ContextMenu {
268268
min_size.as_global(),
269269
),
270270
// to the left -> down
271-
Rectangle::from_loc_and_size(
271+
Rectangle::new(
272272
position + Point::from((-min_size.w, bounds.y.ceil() as i32)),
273273
min_size.as_global(),
274274
),
275275
// to the left -> up
276-
Rectangle::from_loc_and_size(
276+
Rectangle::new(
277277
position
278278
+ Point::from((
279279
-min_size.w,
@@ -669,16 +669,16 @@ impl MenuGrab {
669669

670670
let output = seat.active_output();
671671
let position = [
672-
Rectangle::from_loc_and_size(position, min_size.as_global()), // normal
673-
Rectangle::from_loc_and_size(
672+
Rectangle::new(position, min_size.as_global()), // normal
673+
Rectangle::new(
674674
position - Point::from((min_size.w, 0)),
675675
min_size.as_global(),
676676
), // flipped left
677-
Rectangle::from_loc_and_size(
677+
Rectangle::new(
678678
position - Point::from((0, min_size.h)),
679679
min_size.as_global(),
680680
), // flipped up
681-
Rectangle::from_loc_and_size(
681+
Rectangle::new(
682682
position - Point::from((min_size.w, min_size.h)),
683683
min_size.as_global(),
684684
), // flipped left & up

‎src/shell/grabs/moving.rs‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl MoveGrabState {
114114
CosmicMappedRenderElement::from(IndicatorShader::focus_element(
115115
renderer,
116116
Key::Window(Usage::MoveGrabIndicator, self.window.key()),
117-
Rectangle::from_loc_and_size(
117+
Rectangle::new(
118118
render_location,
119119
self.window
120120
.geometry()
@@ -350,15 +350,15 @@ impl MoveGrab {
350350
fn update_location(&mut self, state: &mut State, location: Point<f64, Logical>) {
351351
let mut shell = state.common.shell.write().unwrap();
352352

353-
let Some(current_output) =
354-
shell
355-
.outputs()
356-
.find(|output| {
357-
output.geometry().as_logical().overlaps_or_touches(
358-
Rectangle::from_loc_and_size(location.to_i32_floor(), (0, 0)),
359-
)
360-
})
361-
.cloned()
353+
let Some(current_output) = shell
354+
.outputs()
355+
.find(|output| {
356+
output
357+
.geometry()
358+
.as_logical()
359+
.overlaps_or_touches(Rectangle::new(location.to_i32_floor(), (0, 0).into()))
360+
})
361+
.cloned()
362362
else {
363363
return;
364364
};
@@ -412,10 +412,7 @@ impl MoveGrab {
412412
for output in &self.window_outputs {
413413
element.output_enter(
414414
output,
415-
Rectangle::from_loc_and_size(
416-
(0, 0),
417-
output.geometry().size.as_logical(),
418-
),
415+
Rectangle::from_size(output.geometry().size.as_logical()),
419416
);
420417
}
421418
(element, geo.loc.as_logical())
@@ -778,7 +775,7 @@ impl Drop for MoveGrab {
778775

779776
match previous {
780777
ManagedLayer::Sticky => {
781-
grab_state.window.set_geometry(Rectangle::from_loc_and_size(
778+
grab_state.window.set_geometry(Rectangle::new(
782779
window_location,
783780
grab_state.window.geometry().size.as_global(),
784781
));
@@ -800,7 +797,7 @@ impl Drop for MoveGrab {
800797
Some((window, location.to_global(&output)))
801798
}
802799
_ => {
803-
grab_state.window.set_geometry(Rectangle::from_loc_and_size(
800+
grab_state.window.set_geometry(Rectangle::new(
804801
window_location,
805802
grab_state.window.geometry().size.as_global(),
806803
));

‎src/shell/layout/floating/grabs/resize.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl ResizeSurfaceGrab {
112112
self.last_window_size = (new_window_width, new_window_height).into();
113113

114114
self.window.set_resizing(true);
115-
self.window.set_geometry(Rectangle::from_loc_and_size(
115+
self.window.set_geometry(Rectangle::new(
116116
if let Some(s) = self.window.active_window().x11_surface() {
117117
s.geometry().loc.as_global()
118118
} else {
@@ -523,7 +523,7 @@ impl ResizeSurfaceGrab {
523523
}
524524

525525
self.window.set_resizing(false);
526-
self.window.set_geometry(Rectangle::from_loc_and_size(
526+
self.window.set_geometry(Rectangle::new(
527527
if let Some(x11_surface) = self.window.active_window().x11_surface() {
528528
x11_surface.geometry().loc.as_global()
529529
} else {

0 commit comments

Comments
 (0)