diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js index d543f2bdf..71ea13d3f 100644 --- a/js/ui/workspaceThumbnail.js +++ b/js/ui/workspaceThumbnail.js @@ -544,6 +544,7 @@ const ThumbnailsBox = new Lang.Class({ this.actor.connect('button-press-event', function() { return true; }); this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease)); + this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent)); Main.overview.connect('item-drag-begin', Lang.bind(this, this._onDragBegin)); @@ -1203,5 +1204,16 @@ const ThumbnailsBox = new Lang.Class({ }, onCompleteScope: this }); + }, + + _onScrollEvent: function (actor, event) { + switch (event.get_scroll_direction()) { + case Clutter.ScrollDirection.UP: + Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP); + break; + case Clutter.ScrollDirection.DOWN: + Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN); + break; + } } }); diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js index bd11076d9..781c0e415 100644 --- a/js/ui/workspacesView.js +++ b/js/ui/workspacesView.js @@ -493,8 +493,6 @@ const WorkspacesDisplay = new Lang.Class({ controls.track_hover = true; controls.connect('notify::hover', Lang.bind(this, this._onControlsHoverChanged)); - controls.connect('scroll-event', - Lang.bind(this, this._onScrollEvent)); this._primaryIndex = Main.layoutManager.primaryIndex; @@ -1013,17 +1011,6 @@ const WorkspacesDisplay = new Lang.Class({ // might as well avoid it. Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, this._updateZoom)); - }, - - _onScrollEvent: function (actor, event) { - switch ( event.get_scroll_direction() ) { - case Clutter.ScrollDirection.UP: - Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP); - break; - case Clutter.ScrollDirection.DOWN: - Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN); - break; - } } }); Signals.addSignalMethods(WorkspacesDisplay.prototype);