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

focus: Restore nested popup grabs

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-10-24 17:40:28 +02:00
parent 724a4170df
commit 781427a74c
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/shell/focus/mod.rs
View file

@ -280,6 +280,31 @@ impl Common {
}
};
} else {
if let KeyboardFocusTarget::Popup(_) = target {
if let Some(popup_grab) = seat
.user_data()
.get::<PopupGrabData>()
.and_then(|x| x.take())
{
if !popup_grab.has_ended() {
if let Some(new) = popup_grab.current_grab() {
trace!("restore focus to previous popup grab");
if let Some(keyboard) = seat.get_keyboard() {
keyboard.set_focus(
state,
Some(new.clone()),
SERIAL_COUNTER.next_serial(),
);
}
ActiveFocus::set(&seat, Some(new));
seat.user_data()
.get_or_insert::<PopupGrabData, _>(PopupGrabData::default)
.set(Some(popup_grab));
continue;
}
}
}
}
trace!("Surface dead, focus fixup");
}
} else {