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

Unwrap user data in cursor_image_status

Browse source 
This is added on creation of the seat, and unwrapped, when setting the
status, so the `unwrap_or` case here seems unnecessary.
This commit is contained in:
Ian Douglas Scott 2025-06-06 15:35:58 -07:00 • committed by Victoria Brekenfeld
parent fa4bffdbe6
commit 3197e52afd
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/shell/seats.rs
View file

@ -377,19 +377,15 @@ impl SeatExt for Seat<State> {
}
fn cursor_image_status(&self) -> CursorImageStatus {
self.user_data()
.get::<Mutex<CursorImageStatus>>()
// Reset the cursor if the surface is no longer alive
.map(|lock| {
let mut cursor_status = lock.lock().unwrap();
if let CursorImageStatus::Surface(ref surface) = *cursor_status {
if !surface.alive() {
*cursor_status = CursorImageStatus::default_named();
}
}
cursor_status.clone()
})
.unwrap_or(CursorImageStatus::default_named())
let lock = self.user_data().get::<Mutex<CursorImageStatus>>().unwrap();
// Reset the cursor if the surface is no longer alive
let mut cursor_status = lock.lock().unwrap();
if let CursorImageStatus::Surface(ref surface) = *cursor_status {
if !surface.alive() {
*cursor_status = CursorImageStatus::default_named();
}
}
cursor_status.clone()
}
fn set_cursor_image_status(&self, status: CursorImageStatus) {