minimal cleanup to DragDropAction, fix icons staying when hover event is spammed

This commit is contained in:
Tom Beckmann 2014-07-17 01:27:25 +02:00
parent 486b505823
commit 6697265dd9
2 changed files with 5 additions and 3 deletions

View File

@ -248,9 +248,9 @@ namespace Gala
last_y = y; last_y = y;
var stage = actor.get_stage (); var stage = actor.get_stage ();
var actor = actor.get_stage ().get_actor_at_pos (PickMode.REACTIVE, (int)x, (int)y); var actor = stage.get_actor_at_pos (PickMode.REACTIVE, (int) x, (int) y);
DragDropAction action = null; DragDropAction action = null;
// if we're allowed to bubble and we this actor is not a destination, check its parents // if we're allowed to bubble and this actor is not a destination, check its parents
if (actor != null && (action = get_drag_drop_action (actor)) == null && allow_bubbling) { if (actor != null && (action = get_drag_drop_action (actor)) == null && allow_bubbling) {
while ((actor = actor.get_parent ()) != stage) { while ((actor = actor.get_parent ()) != stage) {
if ((action = get_drag_drop_action (actor)) != null) if ((action = get_drag_drop_action (actor)) != null)

View File

@ -446,7 +446,9 @@ namespace Gala
} else } else
w.destroy (); w.destroy ();
break;
// don't break here! If people spam hover events and we animate
// removal, we can actually multiple instances of the same window icon
} }
} }
} }