From 1e20a1249a9c0fb716d5d2065a3663badbf2c0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> Date: Sun, 22 Jul 2018 00:46:05 +0200 Subject: [PATCH] dnd: Stop using getTweenCount() Those checks were carried over from the very first DND implementation; if they were ever actually required at all, this is no longer the case as we moved away from Tweener for all our animations. The number of cases where an extension is still using Tweener, creates draggable actors, *AND* requires the checks for proper functioning should be indistinguishable from zero, so drop the code. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/669 --- js/ui/dnd.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/js/ui/dnd.js b/js/ui/dnd.js index db05f6922..6539443cd 100644 --- a/js/ui/dnd.js +++ b/js/ui/dnd.js @@ -6,7 +6,6 @@ const Signals = imports.signals; const Main = imports.ui.main; const Params = imports.misc.params; -const Tweener = imports.ui.tweener; // Time to scale down to maxDragActorSize var SCALE_ANIMATION_TIME = 250; @@ -112,9 +111,6 @@ var _Draggable = class _Draggable { if (event.get_button() != 1) return Clutter.EVENT_PROPAGATE; - if (Tweener.getTweenCount(actor)) - return Clutter.EVENT_PROPAGATE; - this._buttonDown = true; this._grabActor(event.get_device()); @@ -140,9 +136,6 @@ var _Draggable = class _Draggable { !global.display.is_pointer_emulating_sequence(event.get_event_sequence())) return Clutter.EVENT_PROPAGATE; - if (Tweener.getTweenCount(actor)) - return Clutter.EVENT_PROPAGATE; - this._buttonDown = true; this._grabActor(event.get_device(), event.get_event_sequence());