From 553503dace358ffcc83c02a3ecd479d32f8f4743 Mon Sep 17 00:00:00 2001 From: Marina Zhurakhinskaya Date: Tue, 1 Sep 2009 16:29:14 -0400 Subject: [PATCH] Remove the timeout for checking if an item is drawn under the pointer We no longer need the timeout for checking if an item is drawn under the pointer because we display search results in the main pane and there is no lowering/raising of other overview actors going on as the results are being displayed. --- js/ui/genericDisplay.js | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/js/ui/genericDisplay.js b/js/ui/genericDisplay.js index c7759711d..28e6b7ed5 100644 --- a/js/ui/genericDisplay.js +++ b/js/ui/genericDisplay.js @@ -495,24 +495,16 @@ GenericDisplay.prototype = { this.selectFirstItem(); } - // We currently redisplay matching items and raise the sideshow as part of two different callbacks. - // Checking what is under the pointer after a timeout allows us to not merge these callbacks into one, at least for now. - Mainloop.timeout_add(5, - Lang.bind(this, - function() { - // Check if the pointer is over one of the items and display the information button if it is. - let [child, x, y, mask] = Gdk.Screen.get_default().get_root_window().get_pointer(); - let global = Shell.Global.get(); - let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, - x, y); - if (actor != null) { - let item = this._findDisplayedByActor(actor); - if (item != null) { - item.onDrawnUnderPointer(); - } - } - return false; - })); + // Check if the pointer is over one of the items and display the information button if it is. + let [child, x, y, mask] = Gdk.Screen.get_default().get_root_window().get_pointer(); + let global = Shell.Global.get(); + let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y); + if (actor != null) { + let item = this._findDisplayedByActor(actor); + if (item != null) { + item.onDrawnUnderPointer(); + } + } }, // Creates a display item based on the information associated with itemId