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

48
src/input/tablet_emu.rs
View file

@ -105,19 +105,17 @@ impl TabletToolGrab<State> for PointerEmulationGrab {
InputTime::now(), InputTime::now(),
true, true,
); );
} else { } else if let Some(pointer) = self.seat.get_pointer() {
if let Some(pointer) = self.seat.get_pointer() { pointer.motion(
pointer.motion( data,
data, focus,
focus, &pointer::MotionEvent {
&pointer::MotionEvent { location: event.location,
location: event.location, serial: SERIAL_COUNTER.next_serial(),
serial: SERIAL_COUNTER.next_serial(), time: InputTime::now(),
time: InputTime::now(), },
}, );
); pointer.frame(data);
pointer.frame(data);
}
} }
} }
@ -179,19 +177,17 @@ impl TabletToolGrab<State> for PointerEmulationGrab {
InputTime::now(), InputTime::now(),
true, true,
); );
} else { } else if let Some(pointer) = self.seat.get_pointer() {
if let Some(pointer) = self.seat.get_pointer() { pointer.motion(
pointer.motion( data,
data, focus,
focus, &pointer::MotionEvent {
&pointer::MotionEvent { location: event.location,
location: event.location, serial: SERIAL_COUNTER.next_serial(),
serial: SERIAL_COUNTER.next_serial(), time: InputTime::now(),
time: InputTime::now(), },
}, );
); pointer.frame(data);
pointer.frame(data);
}
} }
} }

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, state.common.config.cosmic_conf.edge_snap_threshold,
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::Pointer = grab.grab_type() { && let GrabType::Pointer = grab.grab_type()
seat.get_pointer() {
.unwrap() seat.get_pointer()
.set_grab(state, grab, serial, focus); .unwrap()
} .set_grab(state, grab, serial, focus);
} }
}); });
} }
@ -1785,12 +1785,12 @@ impl PointerTarget<State> for CosmicStack {
&state.common.event_loop_handle, &state.common.event_loop_handle,
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::Pointer = grab.grab_type() { && let GrabType::Pointer = grab.grab_type()
seat.get_pointer() {
.unwrap() seat.get_pointer()
.set_grab(state, grab, serial, focus); .unwrap()
} .set_grab(state, grab, serial, focus);
} }
}); });
} }
@ -1999,13 +1999,13 @@ impl TabletToolTarget<State> for CosmicStack {
state.common.config.cosmic_conf.edge_snap_threshold, state.common.config.cosmic_conf.edge_snap_threshold,
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::TabletTool = grab.grab_type() { && let GrabType::TabletTool = grab.grab_type()
seat.tablet_seat() {
.get_tool(grab.tool().unwrap()) seat.tablet_seat()
.unwrap() .get_tool(grab.tool().unwrap())
.set_grab(state, grab, InputTime::now(), serial, focus); .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, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::Pointer = grab.grab_type() { && let GrabType::Pointer = grab.grab_type()
seat.get_pointer() {
.unwrap() seat.get_pointer()
.set_grab(state, grab, serial, focus) .unwrap()
} .set_grab(state, grab, serial, focus)
} }
}); });
} }
@ -1315,13 +1315,13 @@ impl TabletToolTarget<State> for CosmicWindow {
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::TabletTool = grab.grab_type() { && let GrabType::TabletTool = grab.grab_type()
seat.tablet_seat() {
.get_tool(grab.tool().unwrap()) seat.tablet_seat()
.unwrap() .get_tool(grab.tool().unwrap())
.set_grab(state, grab, InputTime::now(), serial, focus) .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(); let seat = self.seat.clone();
// false-positive: `Output`s hash is based on it's inner ptr // false-positive: `Output`s hash is based on it's inner ptr
#[allow(clippy::mutable_key_type)] #[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 previous = self.previous;
let window = self.window.clone(); let window = self.window.clone();
let is_touch_grab = matches!(self.start_data, GrabStartData::Touch(_)); 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, tool,
data: TabletToolGrabStartData { data: TabletToolGrabStartData {
focus: None, focus: None,
location: location, location,
trigger: TabletToolGrabTrigger::Tip, trigger: TabletToolGrabTrigger::Tip,
}, },
}, },

21
src/wayland/handlers/decoration.rs
View file

@ -69,17 +69,16 @@ impl State {
XdgMode::from_preference(self.default_decoration()) XdgMode::from_preference(self.default_decoration())
}; };
for (window, _) in mapped.windows() { for (window, _) in mapped.windows() {
if PreferredDecorationMode::is_unset(&window.0) { if PreferredDecorationMode::is_unset(&window.0)
if let Some(toplevel) = window.0.toplevel() { && let Some(toplevel) = window.0.toplevel()
if toplevel.with_committed_state(|state| { && toplevel.with_committed_state(|state| {
state.is_some_and(|state| state.decoration_mode.is_some()) state.is_some_and(|state| state.decoration_mode.is_some())
}) { })
toplevel.with_pending_state(|state| { {
state.decoration_mode = Some(mode); toplevel.with_pending_state(|state| {
}); state.decoration_mode = Some(mode);
toplevel.send_configure(); });
} toplevel.send_configure();
}
} }
} }
}; };

1
src/wayland/handlers/pointer_constraints.rs
View file

@ -89,7 +89,6 @@ impl PointerConstraintsHandler for State {
ConstraintRemove::PointerLeave(_) => { ConstraintRemove::PointerLeave(_) => {
// If the constraint was broken by the pointer forcibly leaving the surface, then it doesn't // If the constraint was broken by the pointer forcibly leaving the surface, then it doesn't
// make much sense to warp it. // make much sense to warp it.
return;
} }
ConstraintRemove::Destroyed(constraint) => { ConstraintRemove::Destroyed(constraint) => {
let Some(seat) = self let Some(seat) = self