[gnome-shell/gbsneto/random-cleanups-pt1: 1/3] workspacesView: Rename show/hide to reveal/conceal



commit 775df728cba8a45c63744cf7428c0002a9ea38ff
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Mon Jun 1 12:20:44 2020 -0300

    workspacesView: Rename show/hide to reveal/conceal
    
    WorkspacesDisplay is a ClutterActor subclass, and overriding
    the show and hide methods require chaining up, otherwise the
    actor isn't actually shown or hidden.
    
    To avoid clashing with the pre-existing methods, rename to
    reveal/conceal.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1295

 js/ui/viewSelector.js   | 4 ++--
 js/ui/workspacesView.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 5c0dd9bb75..5a02ddc9e9 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -273,7 +273,7 @@ var ViewSelector = GObject.registerClass({
 
     show() {
         this.reset();
-        this._workspacesDisplay.show(this._showAppsButton.checked);
+        this._workspacesDisplay.reveal(this._showAppsButton.checked);
         this._activePage = null;
         if (this._showAppsButton.checked)
             this._showPage(this._appsPage);
@@ -303,7 +303,7 @@ var ViewSelector = GObject.registerClass({
 
     hide() {
         this.reset();
-        this._workspacesDisplay.hide();
+        this._workspacesDisplay.conceal();
     }
 
     _addPage(actor, name, a11yIcon, params) {
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 09155c5ae1..d9b2857754 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -608,7 +608,7 @@ class WorkspacesDisplay extends St.Widget {
         return this._getPrimaryView().navigate_focus(from, direction, false);
     }
 
-    show(fadeOnPrimary) {
+    reveal(fadeOnPrimary) {
         this._updateWorkspacesViews();
         for (let i = 0; i < this._workspacesViews.length; i++) {
             let animationType;
@@ -640,7 +640,7 @@ class WorkspacesDisplay extends St.Widget {
         }
     }
 
-    hide() {
+    conceal() {
         if (this._restackedNotifyId > 0) {
             Main.overview.disconnect(this._restackedNotifyId);
             this._restackedNotifyId = 0;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]