grabHelper: Ignore events from On-Screen-Keyboard

GrabHelper automatically releases grabs when the user clicks outside
the grabbed actors. However at least for the message-tray (which is
the only user of grabHelper at the moment), we must ignore any events
from the On-Screen-Keyboard, to prevent the tray from hiding at every
key press.

https://bugzilla.gnome.org/show_bug.cgi?id=683546
This commit is contained in:
Florian Müllner 2012-09-21 16:58:03 +02:00
parent 6611d639a8
commit 2e63709450
2 changed files with 9 additions and 0 deletions

View File

@ -318,6 +318,9 @@ const GrabHelper = new Lang.Class({
if (this._isWithinGrabbedActor(event.get_source())) if (this._isWithinGrabbedActor(event.get_source()))
return false; return false;
if (Main.keyboard.shouldTakeEvent(event))
return false;
if (button) { if (button) {
// If we have a press event, ignore the next event, // If we have a press event, ignore the next event,
// which should be a release event. // which should be a release event.

View File

@ -468,6 +468,12 @@ const Keyboard = new Lang.Class({
} }
}, },
shouldTakeEvent: function(event) {
let actor = event.get_source();
return Main.layoutManager.keyboardBox.contains(actor) ||
actor._extended_keys || actor.extended_key;
},
show: function () { show: function () {
this._redraw(); this._redraw();