From 1ad1db406e430000f1e89ecca591042568b3bfa1 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 1 Jan 2021 14:18:18 -0300 Subject: [PATCH] overview: Don't fade OverviewActor Now that the workspace display is properly allocated for each frame, we don't want to fade the entire overview anymore. Part-of: --- js/ui/overview.js | 25 ++----------------------- js/ui/overviewControls.js | 11 +++++++++-- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/js/ui/overview.js b/js/ui/overview.js index aabc4ec07..6606db594 100644 --- a/js/ui/overview.js +++ b/js/ui/overview.js @@ -98,32 +98,11 @@ class OverviewActor extends St.BoxLayout { } animateToOverview(callback) { - this._controls.animateToOverview(); - - this.opacity = 0; - this.ease({ - opacity: 255, - mode: Clutter.AnimationMode.EASE_OUT_QUAD, - duration: ANIMATION_TIME, - onStopped: () => { - if (callback) - callback(); - }, - }); + this._controls.animateToOverview(callback); } animateFromOverview(callback) { - this._controls.animateFromOverview(); - - this.ease({ - opacity: 0, - mode: Clutter.AnimationMode.EASE_OUT_QUAD, - duration: ANIMATION_TIME, - onStopped: () => { - if (callback) - callback(); - }, - }); + this._controls.animateFromOverview(callback); } get dash() { diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js index 516de21b6..756943630 100644 --- a/js/ui/overviewControls.js +++ b/js/ui/overviewControls.js @@ -177,17 +177,21 @@ class ControlsManager extends St.Widget { this._workspaceAdjustment.value = activeIndex; } - animateToOverview() { + animateToOverview(callback) { this.viewSelector.animateToOverview(); this._stateAdjustment.value = ControlsState.HIDDEN; this._stateAdjustment.ease(ControlsState.WINDOW_PICKER, { duration: Overview.ANIMATION_TIME, mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onStopped: () => { + if (callback) + callback(); + }, }); } - animateFromOverview() { + animateFromOverview(callback) { this._ignoreShowAppsButtonToggle = true; this.viewSelector.animateFromOverview(); @@ -198,6 +202,9 @@ class ControlsManager extends St.Widget { onStopped: () => { this.dash.showAppsButton.checked = false; this._ignoreShowAppsButtonToggle = false; + + if (callback) + callback(); }, }); }