[gnome-shell/gnome-3-36] appDisplay: Don't clear signal handler id before emitting



commit 331db650dd8d567130070e05c72b21246a7b57c5
Author: Jonas Ådahl <jadahl gmail com>
Date:   Thu Apr 2 17:47:52 2020 +0000

    appDisplay: Don't clear signal handler id before emitting
    
    Otherwise we won't clear the 'view-loaded' handler after it was emitted.
    
    Also move field initialization to the correct place, i.e. the init
    function of the base class.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1169
    
    
    (cherry picked from commit a9df4e7516cd78f27c92d13fc53942e4c9fb365c)

 js/ui/appDisplay.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 98aa12105c..5be82617bc 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -157,6 +157,10 @@ var BaseAppView = GObject.registerClass({
 
         this._items = new Map();
         this._orderedItems = [];
+
+        this._animateLaterId = 0;
+        this._viewLoadedHandlerId = 0;
+        this._viewIsReady = false;
     }
 
     _childFocused(_actor) {
@@ -192,8 +196,6 @@ var BaseAppView = GObject.registerClass({
             this._items.set(icon.id, icon);
         });
 
-        this._animateLaterId = 0;
-        this._viewLoadedHandlerId = 0;
         this._viewIsReady = true;
         this.emit('view-loaded');
     }
@@ -412,8 +414,6 @@ var AllView = GObject.registerClass({
         this._lastOvershootY = -1;
         this._lastOvershootTimeoutId = 0;
 
-        this._viewIsReady = false;
-
         Main.overview.connect('hidden', () => this.goToPage(0));
 
         this._redisplayWorkId = Main.initializeDeferredWork(this, this._redisplay.bind(this));


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