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

element: Remove unnecessary grab variants

Browse source
This commit is contained in:
Victoria Brekenfeld 2026-08-18 19:16:23 +02:00 • committed by Victoria Brekenfeld
parent 85564f0336
commit e65f6608a4
2 changed files with 9 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1723,19 +1723,10 @@ impl PointerTarget<State> for CosmicStack {
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res {
match grab.grab_type() { if let GrabType::Pointer = grab.grab_type() {
GrabType::Touch => { seat.get_pointer()
seat.get_touch().unwrap().set_grab(state, grab, serial)
}
GrabType::Pointer => seat
.get_pointer()
.unwrap() .unwrap()
.set_grab(state, grab, serial, focus), .set_grab(state, grab, serial, focus);
GrabType::TabletTool => seat
.tablet_seat()
.get_tool(grab.tool().unwrap())
.unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus),
} }
} }
}); });
@ -1793,19 +1784,10 @@ impl PointerTarget<State> for CosmicStack {
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res {
match grab.grab_type() { if let GrabType::Pointer = grab.grab_type() {
GrabType::Touch => { seat.get_pointer()
seat.get_touch().unwrap().set_grab(state, grab, serial)
}
GrabType::Pointer => seat
.get_pointer()
.unwrap() .unwrap()
.set_grab(state, grab, serial, focus), .set_grab(state, grab, serial, focus);
GrabType::TabletTool => seat
.tablet_seat()
.get_tool(grab.tool().unwrap())
.unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus),
} }
} }
}); });

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

@ -1114,19 +1114,10 @@ impl PointerTarget<State> for CosmicWindow {
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res {
match grab.grab_type() { if let GrabType::Pointer = grab.grab_type() {
GrabType::Touch => { seat.get_pointer()
seat.get_touch().unwrap().set_grab(state, grab, serial)
}
GrabType::Pointer => seat
.get_pointer()
.unwrap() .unwrap()
.set_grab(state, grab, serial, focus), .set_grab(state, grab, serial, focus)
GrabType::TabletTool => seat
.tablet_seat()
.get_tool(grab.tool().unwrap())
.unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus),
} }
} }
}); });