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

chore: clippy fixes

Browse source
This commit is contained in:
Hojjat 2026-09-04 07:46:03 -06:00 • committed by Victoria Brekenfeld
parent 057e7b72cc
commit 0f56d214b9
7 changed files with 66 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/shell/element/stack.rs
View file

@ -1724,12 +1724,12 @@ impl PointerTarget<State> for CosmicStack {
state.common.config.cosmic_conf.edge_snap_threshold,
false,
);
if let Some((grab, focus)) = res {
if let GrabType::Pointer = grab.grab_type() {
seat.get_pointer()
.unwrap()
.set_grab(state, grab, serial, focus);
}
if let Some((grab, focus)) = res
&& let GrabType::Pointer = grab.grab_type()
{
seat.get_pointer()
.unwrap()
.set_grab(state, grab, serial, focus);
}
});
}
@ -1785,12 +1785,12 @@ impl PointerTarget<State> for CosmicStack {
&state.common.event_loop_handle,
false,
);
if let Some((grab, focus)) = res {
if let GrabType::Pointer = grab.grab_type() {
seat.get_pointer()
.unwrap()
.set_grab(state, grab, serial, focus);
}
if let Some((grab, focus)) = res
&& let GrabType::Pointer = grab.grab_type()
{
seat.get_pointer()
.unwrap()
.set_grab(state, grab, serial, focus);
}
});
}
@ -1999,13 +1999,13 @@ impl TabletToolTarget<State> for CosmicStack {
state.common.config.cosmic_conf.edge_snap_threshold,
false,
);
if let Some((grab, focus)) = res {
if let GrabType::TabletTool = grab.grab_type() {
seat.tablet_seat()
.get_tool(grab.tool().unwrap())
.unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus);
}
if let Some((grab, focus)) = res
&& let GrabType::TabletTool = grab.grab_type()
{
seat.tablet_seat()
.get_tool(grab.tool().unwrap())
.unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus);
}
});
}

26
src/shell/element/window.rs
View file

@ -1112,12 +1112,12 @@ impl PointerTarget<State> for CosmicWindow {
false,
);
if let Some((grab, focus)) = res {
if let GrabType::Pointer = grab.grab_type() {
seat.get_pointer()
.unwrap()
.set_grab(state, grab, serial, focus)
}
if let Some((grab, focus)) = res
&& let GrabType::Pointer = grab.grab_type()
{
seat.get_pointer()
.unwrap()
.set_grab(state, grab, serial, focus)
}
});
}
@ -1315,13 +1315,13 @@ impl TabletToolTarget<State> for CosmicWindow {
false,
);
if let Some((grab, focus)) = res {
if let GrabType::TabletTool = grab.grab_type() {
seat.tablet_seat()
.get_tool(grab.tool().unwrap())
.unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus)
}
if let Some((grab, focus)) = res
&& let GrabType::TabletTool = grab.grab_type()
{
seat.tablet_seat()
.get_tool(grab.tool().unwrap())
.unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus)
}
});
}

2
src/shell/grabs/moving.rs
View file

@ -905,7 +905,7 @@ impl Drop for MoveGrab {
let seat = self.seat.clone();
// false-positive: `Output`s hash is based on it's inner ptr
#[allow(clippy::mutable_key_type)]
let window_outputs = self.window_outputs.drain().collect::<HashSet<_>>();
let window_outputs = std::mem::take(&mut self.window_outputs);
let previous = self.previous;
let window = self.window.clone();
let is_touch_grab = matches!(self.start_data, GrabStartData::Touch(_));

2
src/shell/layout/tiling/grabs/resize.rs
View file

@ -201,7 +201,7 @@ impl TabletToolTarget<State> for ResizeForkTarget {
tool,
data: TabletToolGrabStartData {
focus: None,
location: location,
location,
trigger: TabletToolGrabTrigger::Tip,
},
},