From a9f11b1f5a3e97c2651dc30b91d8e28ed1ecd55f Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 15 Jan 2021 08:00:50 -0300 Subject: [PATCH] workspacesView/workspacesDisplay: Remove parent opacity hack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now, we set WorkspacesDisplay's opacity directly, so there's no need to have this parent → child glue code anymore. Remove it. Part-of: --- js/ui/workspacesView.js | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js index dc875e5e8..802d15eed 100644 --- a/js/ui/workspacesView.js +++ b/js/ui/workspacesView.js @@ -550,7 +550,6 @@ class WorkspacesDisplay extends St.Widget { this._workspacesOnlyOnPrimaryChanged.bind(this)); this._workspacesOnlyOnPrimaryChanged(); - this._notifyOpacityId = 0; this._restackedNotifyId = 0; this._scrollEventId = 0; this._keyPressEventId = 0; @@ -564,13 +563,6 @@ class WorkspacesDisplay extends St.Widget { } _onDestroy() { - if (this._notifyOpacityId) { - let parent = this.get_parent(); - if (parent) - parent.disconnect(this._notifyOpacityId); - this._notifyOpacityId = 0; - } - if (this._parentSetLater) { Meta.later_remove(this._parentSetLater); this._parentSetLater = 0; @@ -802,34 +794,6 @@ class WorkspacesDisplay extends St.Widget { return this._getPrimaryView().getActiveWorkspace().hasMaximizedWindows(); } - vfunc_parent_set(oldParent) { - if (oldParent && this._notifyOpacityId) - oldParent.disconnect(this._notifyOpacityId); - this._notifyOpacityId = 0; - - if (this._parentSetLater) - return; - - this._parentSetLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => { - this._parentSetLater = 0; - let newParent = this.get_parent(); - if (!newParent) - return; - - // This is kinda hackish - we want the primary view to - // appear as parent of this, though in reality it - // is added directly to Main.layoutManager.overviewGroup - this._notifyOpacityId = newParent.connect('notify::opacity', () => { - let opacity = this.get_parent().opacity; - let primaryView = this._getPrimaryView(); - if (!primaryView) - return; - primaryView.opacity = opacity; - primaryView.visible = opacity != 0; - }); - }); - } - _onRestacked(overview, stackIndices) { for (let i = 0; i < this._workspacesViews.length; i++) this._workspacesViews[i].syncStacking(stackIndices);