From 7f9c709c85d84e73a5a07fa113e57db7d666c8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Sat, 31 Aug 2019 05:21:10 +0200
Subject: [PATCH] appDisplay: Use an St.Widget as base actor for FolderView

This is needed to make possible to convert BaseAppView into a St.Widget so that
all views can inherit from it.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/559
---
 js/ui/appDisplay.js | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index a056a53be..4bb22e920 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -284,6 +284,7 @@ var AllView = class AllView extends BaseAppView {
                                                y_fill: false,
                                                reactive: true,
                                                y_align: St.Align.START });
+
         this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                      x_expand: true, y_expand: true });
         this.actor.add_actor(this._scrollView);
@@ -1226,22 +1227,31 @@ var FolderView = class FolderView extends BaseAppView {
         this._parentView = parentView;
         this._grid._delegate = this;
 
-        this.actor = new St.ScrollView({ overlay_scrollbars: true });
-        this.actor.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
+        this.actor = new St.Widget();
+        this._scrollView = new St.ScrollView({
+            overlay_scrollbars: true,
+            x_fill: true,
+            y_fill: true,
+            x_expand: true,
+            y_expand: true
+        });
+        this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
+        this.actor.add_actor(this._scrollView);
+
         let scrollableContainer = new St.BoxLayout({ vertical: true, reactive: true });
         scrollableContainer.add_actor(this._grid);
-        this.actor.add_actor(scrollableContainer);
+        this._scrollView.add_actor(scrollableContainer);
 
         let action = new Clutter.PanAction({ interpolate: true });
         action.connect('pan', this._onPan.bind(this));
-        this.actor.add_action(action);
+        this._scrollView.add_action(action);
 
         this._folder.connect('changed', this._redisplay.bind(this));
         this._redisplay();
     }
 
     _childFocused(actor) {
-        Util.ensureActorVisibleInScrollView(this.actor, actor);
+        Util.ensureActorVisibleInScrollView(this._scrollView, actor);
     }
 
     // Overridden from BaseAppView
@@ -1271,8 +1281,8 @@ var FolderView = class FolderView extends BaseAppView {
 
     _onPan(action) {
         let [dist_, dx_, dy] = action.get_motion_delta(0);
-        let adjustment = this.actor.vscroll.adjustment;
-        adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
+        let adjustment = this._scrollView.vscroll.adjustment;
+        adjustment.value -= (dy / this._scrollView.height) * adjustment.page_size;
         return false;
     }
 
@@ -1288,7 +1298,7 @@ var FolderView = class FolderView extends BaseAppView {
         // effect to look good, so use the unadjusted padding
         let fadeOffset = Math.min(this._grid.topPadding,
                                   this._grid.bottomPadding);
-        this.actor.update_fade_effect(fadeOffset, 0);
+        this._scrollView.update_fade_effect(fadeOffset, 0);
 
         // Set extra padding to avoid popup or close button being cut off
         this._grid.topPadding = Math.max(this._grid.topPadding - this._offsetForEachSide, 0);
@@ -1296,8 +1306,8 @@ var FolderView = class FolderView extends BaseAppView {
         this._grid.leftPadding = Math.max(this._grid.leftPadding - this._offsetForEachSide, 0);
         this._grid.rightPadding = Math.max(this._grid.rightPadding - this._offsetForEachSide, 0);
 
-        this.actor.set_width(this.usedWidth());
-        this.actor.set_height(this.usedHeight());
+        this._scrollView.set_width(this.usedWidth());
+        this._scrollView.set_height(this.usedHeight());
     }
 
     _getPageAvailableSize() {
@@ -1474,7 +1484,7 @@ var FolderIcon = class FolderIcon {
     open() {
         this._removeMenuTimeout();
         this._ensurePopup();
-        this.view.actor.vscroll.adjustment.value = 0;
+        this.view._scrollView.vscroll.adjustment.value = 0;
         this._openSpaceForPopup();
     }