aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2014-05-06 11:04:57 +0200
committerGerd Hoffmann <kraxel@redhat.com>2014-05-26 08:41:03 +0200
commit746b86703003b4a6e5323b51b324f591dcd1a84b (patch)
tree0d5704d11c6c638a0c294b4c3a5a7877f2bb7f6d
parent4c638e2e4ba03cc9c1bca4400f4c68870208afe3 (diff)
gtk: skip keyboard grab when hover autograb is active
It's pointless. With grab on hover enabled the keyboard grab is already active when you press Ctrl-Alt-G ;) Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/gtk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gtk.c b/ui/gtk.c
index d87bd1bfeb..f8048138fe 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1183,7 +1183,9 @@ static void gd_menu_grab_input(GtkMenuItem *item, void *opaque)
VirtualConsole *vc = gd_vc_find_current(s);
if (gd_is_grab_active(s)) {
- gd_grab_keyboard(vc);
+ if (!gd_grab_on_hover(s)) {
+ gd_grab_keyboard(vc);
+ }
gd_grab_pointer(vc);
} else {
gd_ungrab_keyboard(s);