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

appDisplay: Never use animated indicators

Browse Source 
The app grid itself now is horizontal, and is displayed beneath
workspaces, above the dash. This makes the indicator animations
out of place, as they're not coming from the edge anymore.

Use PageIndicators for both FolderView and AppDisplay.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1629>
This commit is contained in:
Georges Basile Stavracas Neto 2021-01-08 18:23:51 -03:00 committed by Florian Müllner
parent 454394a267
commit 5c7436be3e
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/ui/appDisplay.js
View File

@ -128,11 +128,6 @@ var BaseAppView = GObject.registerClass({
}, },
}, class BaseAppView extends St.Widget { }, class BaseAppView extends St.Widget {
_init(params = {}) { _init(params = {}) {
params = Params.parse(params, { animateIndicators: true }, true);
const animateIndicators = params.animateIndicators;
delete params.animateIndicators;
super._init(params); super._init(params);
this._grid = this._createGrid(); this._grid = this._createGrid();
@ -170,11 +165,8 @@ var BaseAppView = GObject.registerClass({
}); });
// Page Indicators // Page Indicators
const orientation = Clutter.Orientation.HORIZONTAL; this._pageIndicators =
if (animateIndicators) new PageIndicators.PageIndicators(Clutter.Orientation.HORIZONTAL);
this._pageIndicators = new PageIndicators.AnimatedPageIndicators(orientation);
else
this._pageIndicators = new PageIndicators.PageIndicators(orientation);
this._pageIndicators.y_expand = false; this._pageIndicators.y_expand = false;
this._pageIndicators.connect('page-activated', this._pageIndicators.connect('page-activated',
@ -1227,13 +1219,10 @@ class AppDisplay extends BaseAppView {
}; };
if (animationDirection == IconGrid.AnimationDirection.OUT && if (animationDirection == IconGrid.AnimationDirection.OUT &&
this._displayingDialog && this._currentDialog) { this._displayingDialog && this._currentDialog)
this._currentDialog.popdown(); this._currentDialog.popdown();
} else { else
super.animate(animationDirection, completionFunc); super.animate(animationDirection, completionFunc);
if (animationDirection == IconGrid.AnimationDirection.OUT)
this._pageIndicators.animateIndicators(animationDirection);
}
} }
animateSwitch(animationDirection) { animateSwitch(animationDirection) {
@ -1248,9 +1237,6 @@ class AppDisplay extends BaseAppView {
onComplete: () => (this.opacity = 255), onComplete: () => (this.opacity = 255),
}); });
} }
if (animationDirection == IconGrid.AnimationDirection.OUT)
this._pageIndicators.animateIndicators(animationDirection);
} }
goToPage(pageNumber, animate = true) { goToPage(pageNumber, animate = true) {
@ -1739,7 +1725,6 @@ class FolderView extends BaseAppView {
layout_manager: new Clutter.BinLayout(), layout_manager: new Clutter.BinLayout(),
x_expand: true, x_expand: true,
y_expand: true, y_expand: true,
animateIndicators: false,
}); });
// If it not expand, the parent doesn't take into account its preferred_width when allocating // If it not expand, the parent doesn't take into account its preferred_width when allocating