Migrate away from Rectangle::from_loc_and_size
Deprecated in `smithay` by https://github.com/Smithay/smithay/pull/1621.
This commit is contained in:
Ian Douglas Scott
Victoria Brekenfeld
parent
9074447c4f
commit
b685512127
26 changed files with 184 additions and 201 deletions
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -476,7 +476,7 @@ impl TilingLayout {
|
|||
*current_sizes = sizes;
|
||||
let new_node = Node::new(Data::Mapped {
|
||||
mapped: window.clone(),
|
||||
last_geometry: Rectangle::from_loc_and_size((0, 0), (100, 100)),
|
||||
last_geometry: Rectangle::from_size((100, 100).into()),
|
||||
minimize_rect: Some(from),
|
||||
});
|
||||
let new_id = tree
|
||||
|
|
@ -499,7 +499,7 @@ impl TilingLayout {
|
|||
let sibling_id = sibling.unwrap();
|
||||
let new_node = Node::new(Data::Mapped {
|
||||
mapped: window.clone(),
|
||||
last_geometry: Rectangle::from_loc_and_size((0, 0), (100, 100)),
|
||||
last_geometry: Rectangle::from_size((100, 100).into()),
|
||||
minimize_rect: Some(from),
|
||||
});
|
||||
|
||||
|
|
@ -546,7 +546,7 @@ impl TilingLayout {
|
|||
let window = window.into();
|
||||
let new_window = Node::new(Data::Mapped {
|
||||
mapped: window.clone(),
|
||||
last_geometry: Rectangle::from_loc_and_size((0, 0), (100, 100)),
|
||||
last_geometry: Rectangle::from_size((100, 100).into()),
|
||||
minimize_rect,
|
||||
});
|
||||
|
||||
|
|
@ -1511,7 +1511,7 @@ impl TilingLayout {
|
|||
|
||||
let new_node = Node::new(Data::Mapped {
|
||||
mapped: mapped.clone(),
|
||||
last_geometry: Rectangle::from_loc_and_size((0, 0), (100, 100)),
|
||||
last_geometry: Rectangle::from_size((100, 100).into()),
|
||||
minimize_rect: None,
|
||||
});
|
||||
let new_id = tree.insert(new_node, InsertBehavior::AsRoot).unwrap();
|
||||
|
|
@ -2651,7 +2651,7 @@ impl TilingLayout {
|
|||
.insert(
|
||||
Node::new(Data::Mapped {
|
||||
mapped: window.clone(),
|
||||
last_geometry: Rectangle::from_loc_and_size((0, 0), (100, 100)),
|
||||
last_geometry: Rectangle::from_size((100, 100).into()),
|
||||
minimize_rect: None,
|
||||
}),
|
||||
InsertBehavior::UnderNode(group_id),
|
||||
|
|
@ -2687,7 +2687,7 @@ impl TilingLayout {
|
|||
.insert(
|
||||
Node::new(Data::Mapped {
|
||||
mapped: window.clone(),
|
||||
last_geometry: Rectangle::from_loc_and_size((0, 0), (100, 100)),
|
||||
last_geometry: Rectangle::from_size((100, 100).into()),
|
||||
minimize_rect: None,
|
||||
}),
|
||||
InsertBehavior::UnderNode(group_id),
|
||||
|
|
@ -2720,7 +2720,7 @@ impl TilingLayout {
|
|||
.insert(
|
||||
Node::new(Data::Mapped {
|
||||
mapped: window.clone(),
|
||||
last_geometry: Rectangle::from_loc_and_size((0, 0), (100, 100)),
|
||||
last_geometry: Rectangle::from_size((100, 100).into()),
|
||||
minimize_rect: None,
|
||||
}),
|
||||
InsertBehavior::UnderNode(&window_id),
|
||||
|
|
@ -2861,7 +2861,7 @@ impl TilingLayout {
|
|||
) -> Result<NodeId, NodeIdError> {
|
||||
let new_group = Node::new(Data::new_group(
|
||||
orientation,
|
||||
Rectangle::from_loc_and_size((0, 0), (100, 100)),
|
||||
Rectangle::from_size((100, 100).into()),
|
||||
));
|
||||
let old = tree.get(old_id)?;
|
||||
let parent_id = old.parent().cloned();
|
||||
|
|
@ -3059,9 +3059,9 @@ impl TilingLayout {
|
|||
let mut previous: i32 = sizes.iter().sum();
|
||||
for size in sizes.iter().rev() {
|
||||
previous -= *size;
|
||||
stack.push(Rectangle::from_loc_and_size(
|
||||
(geo.loc.x, geo.loc.y + previous),
|
||||
(geo.size.w, *size),
|
||||
stack.push(Rectangle::new(
|
||||
(geo.loc.x, geo.loc.y + previous).into(),
|
||||
(geo.size.w, *size).into(),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
@ -3069,9 +3069,9 @@ impl TilingLayout {
|
|||
let mut previous: i32 = sizes.iter().sum();
|
||||
for size in sizes.iter().rev() {
|
||||
previous -= *size;
|
||||
stack.push(Rectangle::from_loc_and_size(
|
||||
(geo.loc.x + previous, geo.loc.y),
|
||||
(*size, geo.size.h),
|
||||
stack.push(Rectangle::new(
|
||||
(geo.loc.x + previous, geo.loc.y).into(),
|
||||
(*size, geo.size.h).into(),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
@ -3422,18 +3422,18 @@ impl TilingLayout {
|
|||
Some((_, TargetZone::GroupEdge(id, Direction::Left)))
|
||||
if *id == res_id =>
|
||||
{
|
||||
let zone = Rectangle::from_loc_and_size(
|
||||
let zone = Rectangle::new(
|
||||
last_geometry.loc,
|
||||
(80, last_geometry.size.h),
|
||||
(80, last_geometry.size.h).into(),
|
||||
);
|
||||
last_geometry.loc.x += 80;
|
||||
last_geometry.size.w -= 80;
|
||||
zone
|
||||
}
|
||||
_ => {
|
||||
let zone = Rectangle::from_loc_and_size(
|
||||
let zone = Rectangle::new(
|
||||
last_geometry.loc,
|
||||
(32, last_geometry.size.h),
|
||||
(32, last_geometry.size.h).into(),
|
||||
);
|
||||
last_geometry.loc.x += 32;
|
||||
last_geometry.size.w -= 32;
|
||||
|
|
@ -3444,18 +3444,18 @@ impl TilingLayout {
|
|||
Some((_, TargetZone::GroupEdge(id, Direction::Up)))
|
||||
if *id == res_id =>
|
||||
{
|
||||
let zone = Rectangle::from_loc_and_size(
|
||||
let zone = Rectangle::new(
|
||||
last_geometry.loc,
|
||||
(last_geometry.size.w, 80),
|
||||
(last_geometry.size.w, 80).into(),
|
||||
);
|
||||
last_geometry.loc.y += 80;
|
||||
last_geometry.size.h -= 80;
|
||||
zone
|
||||
}
|
||||
_ => {
|
||||
let zone = Rectangle::from_loc_and_size(
|
||||
let zone = Rectangle::new(
|
||||
last_geometry.loc,
|
||||
(last_geometry.size.w, 32),
|
||||
(last_geometry.size.w, 32).into(),
|
||||
);
|
||||
last_geometry.loc.y += 32;
|
||||
last_geometry.size.h -= 32;
|
||||
|
|
@ -3466,23 +3466,25 @@ impl TilingLayout {
|
|||
Some((_, TargetZone::GroupEdge(id, Direction::Right)))
|
||||
if *id == res_id =>
|
||||
{
|
||||
let zone = Rectangle::from_loc_and_size(
|
||||
let zone = Rectangle::new(
|
||||
(
|
||||
last_geometry.loc.x + last_geometry.size.w - 80,
|
||||
last_geometry.loc.y,
|
||||
),
|
||||
(80, last_geometry.size.h),
|
||||
)
|
||||
.into(),
|
||||
(80, last_geometry.size.h).into(),
|
||||
);
|
||||
last_geometry.size.w -= 80;
|
||||
zone
|
||||
}
|
||||
_ => {
|
||||
let zone = Rectangle::from_loc_and_size(
|
||||
let zone = Rectangle::new(
|
||||
(
|
||||
last_geometry.loc.x + last_geometry.size.w - 32,
|
||||
last_geometry.loc.y,
|
||||
),
|
||||
(32, last_geometry.size.h),
|
||||
)
|
||||
.into(),
|
||||
(32, last_geometry.size.h).into(),
|
||||
);
|
||||
last_geometry.size.w -= 32;
|
||||
zone
|
||||
|
|
@ -3492,23 +3494,25 @@ impl TilingLayout {
|
|||
Some((_, TargetZone::GroupEdge(id, Direction::Down)))
|
||||
if *id == res_id =>
|
||||
{
|
||||
let zone = Rectangle::from_loc_and_size(
|
||||
let zone = Rectangle::new(
|
||||
(
|
||||
last_geometry.loc.x,
|
||||
last_geometry.loc.y + last_geometry.size.h - 80,
|
||||
),
|
||||
(last_geometry.size.w, 80),
|
||||
)
|
||||
.into(),
|
||||
(last_geometry.size.w, 80).into(),
|
||||
);
|
||||
last_geometry.size.h -= 80;
|
||||
zone
|
||||
}
|
||||
_ => {
|
||||
let zone = Rectangle::from_loc_and_size(
|
||||
let zone = Rectangle::new(
|
||||
(
|
||||
last_geometry.loc.x,
|
||||
last_geometry.loc.y + last_geometry.size.h - 32,
|
||||
),
|
||||
(last_geometry.size.w, 32),
|
||||
)
|
||||
.into(),
|
||||
(last_geometry.size.w, 32).into(),
|
||||
);
|
||||
last_geometry.size.h -= 32;
|
||||
zone
|
||||
|
|
@ -3722,9 +3726,8 @@ impl TilingLayout {
|
|||
let id = tree
|
||||
.insert(
|
||||
Node::new(Data::Placeholder {
|
||||
last_geometry: Rectangle::from_loc_and_size(
|
||||
(0, 0),
|
||||
(100, 100),
|
||||
last_geometry: Rectangle::from_size(
|
||||
(100, 100).into(),
|
||||
),
|
||||
initial_placeholder: false,
|
||||
}),
|
||||
|
|
@ -4244,7 +4247,7 @@ fn swap_geometry(
|
|||
relative_to.loc.y,
|
||||
));
|
||||
|
||||
Rectangle::from_loc_and_size(loc, new_size)
|
||||
Rectangle::new(loc, new_size)
|
||||
}
|
||||
|
||||
fn geometries_for_groupview<'a, R>(
|
||||
|
|
@ -4284,7 +4287,7 @@ where
|
|||
let mut stack = Vec::new();
|
||||
if swap_tree.is_some() {
|
||||
// push bogos value, that will get ignored anyway
|
||||
stack.push((Rectangle::from_loc_and_size((0, 0), (320, 240)), 0));
|
||||
stack.push((Rectangle::from_size((320, 240).into()), 0));
|
||||
}
|
||||
if root.is_some() {
|
||||
stack.push((non_exclusive_zone, 0));
|
||||
|
|
@ -4553,44 +4556,38 @@ where
|
|||
if let Some(PillIndicator::Outer(direction)) = pill_indicator {
|
||||
let (pill_geo, remaining_geo) = match direction {
|
||||
Direction::Left => (
|
||||
Rectangle::from_loc_and_size(
|
||||
(geo.loc.x, geo.loc.y),
|
||||
(16, geo.size.h),
|
||||
Rectangle::new(
|
||||
(geo.loc.x, geo.loc.y).into(),
|
||||
(16, geo.size.h).into(),
|
||||
),
|
||||
Rectangle::from_loc_and_size(
|
||||
(geo.loc.x + 48, geo.loc.y),
|
||||
(geo.size.w - 48, geo.size.h),
|
||||
Rectangle::new(
|
||||
(geo.loc.x + 48, geo.loc.y).into(),
|
||||
(geo.size.w - 48, geo.size.h).into(),
|
||||
),
|
||||
),
|
||||
Direction::Up => (
|
||||
Rectangle::from_loc_and_size(
|
||||
(geo.loc.x, geo.loc.y),
|
||||
(geo.size.w, 16),
|
||||
Rectangle::new(
|
||||
(geo.loc.x, geo.loc.y).into(),
|
||||
(geo.size.w, 16).into(),
|
||||
),
|
||||
Rectangle::from_loc_and_size(
|
||||
(geo.loc.x, geo.loc.y + 48),
|
||||
(geo.size.w, geo.size.h - 48),
|
||||
Rectangle::new(
|
||||
(geo.loc.x, geo.loc.y + 48).into(),
|
||||
(geo.size.w, geo.size.h - 48).into(),
|
||||
),
|
||||
),
|
||||
Direction::Right => (
|
||||
Rectangle::from_loc_and_size(
|
||||
(geo.loc.x + geo.size.w - 16, geo.loc.y),
|
||||
(16, geo.size.h),
|
||||
),
|
||||
Rectangle::from_loc_and_size(
|
||||
geo.loc,
|
||||
(geo.size.w - 48, geo.size.h),
|
||||
Rectangle::new(
|
||||
(geo.loc.x + geo.size.w - 16, geo.loc.y).into(),
|
||||
(16, geo.size.h).into(),
|
||||
),
|
||||
Rectangle::new(geo.loc, (geo.size.w - 48, geo.size.h).into()),
|
||||
),
|
||||
Direction::Down => (
|
||||
Rectangle::from_loc_and_size(
|
||||
(geo.loc.x, geo.loc.y + geo.size.h - 16),
|
||||
(geo.size.w, 16),
|
||||
),
|
||||
Rectangle::from_loc_and_size(
|
||||
geo.loc,
|
||||
(geo.size.w, geo.size.h - 48),
|
||||
Rectangle::new(
|
||||
(geo.loc.x, geo.loc.y + geo.size.h - 16).into(),
|
||||
(geo.size.w, 16).into(),
|
||||
),
|
||||
Rectangle::new(geo.loc, (geo.size.w, geo.size.h - 48).into()),
|
||||
),
|
||||
};
|
||||
|
||||
|
|
@ -4683,9 +4680,9 @@ where
|
|||
let mut previous: i32 = sizes.iter().sum();
|
||||
for (idx, size) in sizes.iter().enumerate().rev() {
|
||||
previous -= *size;
|
||||
let mut geo = Rectangle::from_loc_and_size(
|
||||
(geo.loc.x, geo.loc.y + previous),
|
||||
(geo.size.w, *size),
|
||||
let mut geo = Rectangle::new(
|
||||
(geo.loc.x, geo.loc.y + previous).into(),
|
||||
(geo.size.w, *size).into(),
|
||||
);
|
||||
if mouse_tiling.is_some() {
|
||||
if let Some(PillIndicator::Inner(pill_idx)) = pill_indicator {
|
||||
|
|
@ -4702,9 +4699,9 @@ where
|
|||
BackdropShader::element(
|
||||
*renderer,
|
||||
placeholder_id.clone(),
|
||||
Rectangle::from_loc_and_size(
|
||||
(geo.loc.x, geo.loc.y - 8),
|
||||
(geo.size.w, 16),
|
||||
Rectangle::new(
|
||||
(geo.loc.x, geo.loc.y - 8).into(),
|
||||
(geo.size.w, 16).into(),
|
||||
),
|
||||
8.,
|
||||
alpha * 0.4,
|
||||
|
|
@ -4725,9 +4722,9 @@ where
|
|||
let mut previous: i32 = sizes.iter().sum();
|
||||
for (idx, size) in sizes.iter().enumerate().rev() {
|
||||
previous -= *size;
|
||||
let mut geo = Rectangle::from_loc_and_size(
|
||||
(geo.loc.x + previous, geo.loc.y),
|
||||
(*size, geo.size.h),
|
||||
let mut geo = Rectangle::new(
|
||||
(geo.loc.x + previous, geo.loc.y).into(),
|
||||
(*size, geo.size.h).into(),
|
||||
);
|
||||
if mouse_tiling.is_some() {
|
||||
if let Some(PillIndicator::Inner(pill_idx)) = pill_indicator {
|
||||
|
|
@ -4744,9 +4741,9 @@ where
|
|||
BackdropShader::element(
|
||||
*renderer,
|
||||
placeholder_id.clone(),
|
||||
Rectangle::from_loc_and_size(
|
||||
(geo.loc.x - 8, geo.loc.y),
|
||||
(16, geo.size.h),
|
||||
Rectangle::new(
|
||||
(geo.loc.x - 8, geo.loc.y).into(),
|
||||
(16, geo.size.h).into(),
|
||||
),
|
||||
8.,
|
||||
alpha * 0.4,
|
||||
|
|
@ -5076,12 +5073,13 @@ fn render_old_tree(
|
|||
.unwrap_or_else(|| (1.0.into(), (0, 0).into()));
|
||||
let geo = scaled_geo
|
||||
.map(|adapted_geo| {
|
||||
Rectangle::from_loc_and_size(
|
||||
Rectangle::new(
|
||||
adapted_geo.loc + offset,
|
||||
(
|
||||
(original_geo.size.w as f64 * scale).round() as i32,
|
||||
(original_geo.size.h as f64 * scale).round() as i32,
|
||||
),
|
||||
)
|
||||
.into(),
|
||||
)
|
||||
})
|
||||
.unwrap_or(*original_geo);
|
||||
|
|
@ -5643,12 +5641,13 @@ fn render_new_tree(
|
|||
old_scaled_geo
|
||||
.unwrap()
|
||||
.map(|adapted_geo| {
|
||||
Rectangle::from_loc_and_size(
|
||||
Rectangle::new(
|
||||
adapted_geo.loc + offset,
|
||||
(
|
||||
(original_geo.size.w as f64 * scale).round() as i32,
|
||||
(original_geo.size.h as f64 * scale).round() as i32,
|
||||
),
|
||||
)
|
||||
.into(),
|
||||
)
|
||||
})
|
||||
.unwrap_or(*original_geo),
|
||||
|
|
@ -5672,12 +5671,13 @@ fn render_new_tree(
|
|||
.unwrap_or_else(|| (1.0.into(), (0, 0).into()));
|
||||
let new_geo = scaled_geo
|
||||
.map(|adapted_geo| {
|
||||
Rectangle::from_loc_and_size(
|
||||
Rectangle::new(
|
||||
adapted_geo.loc + offset,
|
||||
(
|
||||
(original_geo.size.w as f64 * scale).round() as i32,
|
||||
(original_geo.size.h as f64 * scale).round() as i32,
|
||||
),
|
||||
)
|
||||
.into(),
|
||||
)
|
||||
})
|
||||
.unwrap_or(*original_geo);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue