brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

appDisplay: Use an St.Widget as base actor for FolderView

Browse Source 
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
This commit is contained in:
Marco Trevisan (Treviño) 2019-08-31 05:21:10 +02:00 committed by Florian Müllner
parent 74d7d3e259
commit 7f9c709c85
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/ui/appDisplay.js
View File

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