chore: clippy
This commit is contained in:
Vukašin Vojinović
Victoria Brekenfeld
parent
3b70bc0265
commit
0847247c33
77 changed files with 865 additions and 1029 deletions
|
|
@ -101,22 +101,18 @@ impl ResizeSurfaceGrab {
|
|||
// If the resizing vertical edge is close to our output's edge in the same direction, snap to it.
|
||||
let output_geom = self.output.geometry().to_local(&self.output);
|
||||
if self.edges.intersects(ResizeEdge::LEFT) {
|
||||
if ((self.initial_window_location.x - dx as i32 - output_geom.loc.x).abs() as u32)
|
||||
if (self.initial_window_location.x - dx as i32 - output_geom.loc.x).unsigned_abs()
|
||||
< self.edge_snap_threshold
|
||||
{
|
||||
new_window_width = self.initial_window_size.w - output_geom.loc.x
|
||||
+ self.initial_window_location.x;
|
||||
}
|
||||
} else {
|
||||
if ((self.initial_window_location.x + self.initial_window_size.w + dx as i32
|
||||
- output_geom.loc.x
|
||||
- output_geom.size.w)
|
||||
.abs() as u32)
|
||||
< self.edge_snap_threshold
|
||||
{
|
||||
new_window_width =
|
||||
output_geom.loc.x - self.initial_window_location.x + output_geom.size.w;
|
||||
}
|
||||
} else if (self.initial_window_location.x + self.initial_window_size.w + dx as i32
|
||||
- output_geom.loc.x - output_geom.size.w).unsigned_abs()
|
||||
< self.edge_snap_threshold
|
||||
{
|
||||
new_window_width =
|
||||
output_geom.loc.x - self.initial_window_location.x + output_geom.size.w;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -131,22 +127,18 @@ impl ResizeSurfaceGrab {
|
|||
// If the resizing horizontal edge is close to our output's edge in the same direction, snap to it.
|
||||
let output_geom = self.output.geometry().to_local(&self.output);
|
||||
if self.edges.intersects(ResizeEdge::TOP) {
|
||||
if ((self.initial_window_location.y - dy as i32 - output_geom.loc.y).abs() as u32)
|
||||
if (self.initial_window_location.y - dy as i32 - output_geom.loc.y).unsigned_abs()
|
||||
< self.edge_snap_threshold
|
||||
{
|
||||
new_window_height = self.initial_window_size.h - output_geom.loc.y
|
||||
+ self.initial_window_location.y;
|
||||
}
|
||||
} else {
|
||||
if ((self.initial_window_location.y + self.initial_window_size.h + dy as i32
|
||||
- output_geom.loc.y
|
||||
- output_geom.size.h)
|
||||
.abs() as u32)
|
||||
< self.edge_snap_threshold
|
||||
{
|
||||
new_window_height =
|
||||
output_geom.loc.y - self.initial_window_location.y + output_geom.size.h;
|
||||
}
|
||||
} else if (self.initial_window_location.y + self.initial_window_size.h + dy as i32
|
||||
- output_geom.loc.y - output_geom.size.h).unsigned_abs()
|
||||
< self.edge_snap_threshold
|
||||
{
|
||||
new_window_height =
|
||||
output_geom.loc.y - self.initial_window_location.y + output_geom.size.h;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -361,10 +353,8 @@ impl TouchGrab<State> for ResizeSurfaceGrab {
|
|||
event: &TouchMotionEvent,
|
||||
seq: Serial,
|
||||
) {
|
||||
if event.slot == <Self as TouchGrab<State>>::start_data(self).slot {
|
||||
if self.update_location(event.location.as_global()) {
|
||||
handle.unset_grab(self, data);
|
||||
}
|
||||
if event.slot == <Self as TouchGrab<State>>::start_data(self).slot && self.update_location(event.location.as_global()) {
|
||||
handle.unset_grab(self, data);
|
||||
}
|
||||
|
||||
handle.motion(data, None, event, seq);
|
||||
|
|
@ -514,7 +504,7 @@ impl ResizeSurfaceGrab {
|
|||
|
||||
if edges.intersects(ResizeEdge::TOP_LEFT) {
|
||||
let size = window.geometry().size;
|
||||
let mut new = location.clone();
|
||||
let mut new = location;
|
||||
if edges.intersects(ResizeEdge::LEFT) {
|
||||
new.x = initial_window_location.x + (initial_window_size.w - size.w);
|
||||
}
|
||||
|
|
@ -555,7 +545,7 @@ impl ResizeSurfaceGrab {
|
|||
}
|
||||
floating_layer.space.map_element(
|
||||
window,
|
||||
new_location.to_local(&output).as_logical(),
|
||||
new_location.to_local(output).as_logical(),
|
||||
false,
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ impl Animation {
|
|||
}
|
||||
| Animation::Unminimize {
|
||||
target_geometry, ..
|
||||
} => (MINIMIZE_ANIMATION_DURATION, target_geometry.clone()),
|
||||
} => (MINIMIZE_ANIMATION_DURATION, *target_geometry),
|
||||
Animation::Tiled { .. } => {
|
||||
let target_geometry = if let Some(target_rect) =
|
||||
tiled_state.map(|state| state.relative_geometry(output_geometry, gaps))
|
||||
|
|
@ -149,7 +149,7 @@ impl Animation {
|
|||
(ANIMATION_DURATION, target_geometry)
|
||||
}
|
||||
};
|
||||
let previous_rect = self.previous_geometry().clone();
|
||||
let previous_rect = *self.previous_geometry();
|
||||
let start = *self.start();
|
||||
let now = Instant::now();
|
||||
let progress =
|
||||
|
|
@ -284,7 +284,7 @@ impl FloatingLayout {
|
|||
}
|
||||
.to_f64();
|
||||
let output_geometry = {
|
||||
let layers = layer_map_for_output(&output);
|
||||
let layers = layer_map_for_output(output);
|
||||
layers.non_exclusive_zone()
|
||||
};
|
||||
|
||||
|
|
@ -295,7 +295,7 @@ impl FloatingLayout {
|
|||
.collect::<Vec<_>>()
|
||||
.into_iter()
|
||||
{
|
||||
let tiled_state = mapped.floating_tiled.lock().unwrap().clone();
|
||||
let tiled_state = *mapped.floating_tiled.lock().unwrap();
|
||||
if let Some(tiled_state) = tiled_state {
|
||||
let geometry = tiled_state.relative_geometry(output_geometry, self.gaps());
|
||||
self.map_internal(
|
||||
|
|
@ -383,7 +383,7 @@ impl FloatingLayout {
|
|||
}
|
||||
if mapped.floating_tiled.lock().unwrap().take().is_some() {
|
||||
if let Some(state) = mapped.maximized_state.lock().unwrap().as_mut() {
|
||||
if let Some(real_old_geo) = mapped.last_geometry.lock().unwrap().clone() {
|
||||
if let Some(real_old_geo) = *mapped.last_geometry.lock().unwrap() {
|
||||
state.original_geometry = real_old_geo;
|
||||
}
|
||||
};
|
||||
|
|
@ -407,7 +407,7 @@ impl FloatingLayout {
|
|||
let layers = layer_map_for_output(&output);
|
||||
let output_geometry = layers.non_exclusive_zone();
|
||||
mapped.set_bounds(output_geometry.size);
|
||||
let last_geometry = mapped.last_geometry.lock().unwrap().clone();
|
||||
let last_geometry = *mapped.last_geometry.lock().unwrap();
|
||||
let min_size = mapped.min_size().unwrap_or((320, 240).into());
|
||||
|
||||
if let Some(size) = size
|
||||
|
|
@ -688,7 +688,7 @@ impl FloatingLayout {
|
|||
*window.last_geometry.lock().unwrap() = Some(mapped_geometry);
|
||||
}
|
||||
|
||||
self.space.unmap_elem(&window);
|
||||
self.space.unmap_elem(window);
|
||||
if let Some(pos) = self.spawn_order.iter().position(|w| w == window) {
|
||||
self.spawn_order.truncate(pos);
|
||||
}
|
||||
|
|
@ -877,7 +877,7 @@ impl FloatingLayout {
|
|||
}
|
||||
|
||||
pub fn stacking_indicator(&self) -> Option<Rectangle<i32, Local>> {
|
||||
self.hovered_stack.as_ref().map(|(_, geo)| geo.clone())
|
||||
self.hovered_stack.as_ref().map(|(_, geo)| *geo)
|
||||
}
|
||||
|
||||
pub fn resize_request(
|
||||
|
|
@ -890,7 +890,7 @@ impl FloatingLayout {
|
|||
release: ReleaseMode,
|
||||
) -> Option<ResizeSurfaceGrab> {
|
||||
if seat.get_pointer().is_some() {
|
||||
let location = self.space.element_location(&mapped)?.as_local();
|
||||
let location = self.space.element_location(mapped)?.as_local();
|
||||
let size = mapped.geometry().size;
|
||||
mapped.moved_since_mapped.store(true, Ordering::SeqCst);
|
||||
|
||||
|
|
@ -934,7 +934,7 @@ impl FloatingLayout {
|
|||
let Some(original_geo) = self.space.element_geometry(mapped) else {
|
||||
return false; // we don't have that window
|
||||
};
|
||||
let mut geo = original_geo.clone();
|
||||
let mut geo = original_geo;
|
||||
|
||||
if edge.contains(ResizeEdge::RIGHT) || edge.contains(ResizeEdge::LEFT) {
|
||||
if direction == ResizeDirection::Inwards {
|
||||
|
|
@ -1313,7 +1313,7 @@ impl FloatingLayout {
|
|||
let window_geometry = if mapped.is_maximized(false) {
|
||||
geometry
|
||||
} else {
|
||||
prev.clone()
|
||||
prev
|
||||
.map(|mut rect| {
|
||||
if let Some(old_size) = old_output_size {
|
||||
rect = Rectangle::new(
|
||||
|
|
@ -1529,14 +1529,14 @@ impl FloatingLayout {
|
|||
.to_physical_precise_round(output_scale),
|
||||
scale,
|
||||
);
|
||||
let relocated = RelocateRenderElement::from_element(
|
||||
|
||||
RelocateRenderElement::from_element(
|
||||
rescaled,
|
||||
(geometry.loc - original_geo.loc)
|
||||
.as_logical()
|
||||
.to_physical_precise_round(output_scale),
|
||||
Relocate::Relative,
|
||||
);
|
||||
relocated
|
||||
)
|
||||
})
|
||||
}
|
||||
CosmicMappedRenderElement::Window(elem) => {
|
||||
|
|
@ -1549,14 +1549,14 @@ impl FloatingLayout {
|
|||
.to_physical_precise_round(output_scale),
|
||||
scale,
|
||||
);
|
||||
let relocated = RelocateRenderElement::from_element(
|
||||
|
||||
RelocateRenderElement::from_element(
|
||||
rescaled,
|
||||
(geometry.loc - original_geo.loc)
|
||||
.as_logical()
|
||||
.to_physical_precise_round(output_scale),
|
||||
Relocate::Relative,
|
||||
);
|
||||
relocated
|
||||
)
|
||||
})
|
||||
}
|
||||
x => x,
|
||||
|
|
@ -1566,7 +1566,7 @@ impl FloatingLayout {
|
|||
|
||||
if focused == Some(elem) && !elem.is_maximized(false) {
|
||||
if let Some((mode, resize)) = resize_indicator.as_mut() {
|
||||
let mut resize_geometry = geometry.clone();
|
||||
let mut resize_geometry = geometry;
|
||||
resize_geometry.loc -= (18, 18).into();
|
||||
resize_geometry.size += (36, 36).into();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue