rustdesk/qemu-display
1
0
Fork 0
mirror of https://github.com/rustdesk/qemu-display.git synced 2025-07-01 23:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtk: restore system shortcut on ungrab

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-03-26 01:50:44 +04:00
parent f6bbaf0b2d
commit 740cef6d4b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qemu-gtk4/src/console.rs
View File

@ -94,15 +94,16 @@ mod imp {
let ec = gtk::EventControllerKey::new(); let ec = gtk::EventControllerKey::new();
ec.set_propagation_phase(gtk::PropagationPhase::Capture); ec.set_propagation_phase(gtk::PropagationPhase::Capture);
ec.connect_key_pressed(clone!(@weak obj => @default-panic, move |ec, keyval, keycode, state| { ec.connect_key_pressed(clone!(@weak obj, @weak toplevel => @default-panic, move |ec, keyval, keycode, state| {
let priv_ = imp::QemuConsole::from_instance(&obj); let priv_ = imp::QemuConsole::from_instance(&obj);
if let Some(ref e) = ec.get_current_event() { if let Some(ref e) = ec.get_current_event() {
if priv_.ungrab_shortcut.get().unwrap().trigger(e, false) == gdk::KeyMatch::Exact { if priv_.ungrab_shortcut.get().unwrap().trigger(e, false) == gdk::KeyMatch::Exact {
//widget.remove_controller(ec); here crashes badly //widget.remove_controller(ec); here crashes badly
glib::idle_add_local(clone!(@weak ec => @default-panic, move || { glib::idle_add_local(clone!(@weak ec, @weak toplevel => @default-panic, move || {
if let Some(widget) = ec.get_widget() { if let Some(widget) = ec.get_widget() {
widget.remove_controller(&ec); widget.remove_controller(&ec);
} }
toplevel.restore_system_shortcuts();
glib::Continue(false) glib::Continue(false)
})); }));
} else { } else {