appDisplay: Don't update fade effect
We'll have to dismantle parts of AppDisplay and BaseAppView in order to introduce navigation arrows in a way that won't drive people insane. Start this dismantling by removing the fade effect. It looks odd for now, since we still set padding to the app grid, but that will change soon too. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2335>
This commit is contained in:
parent
98e6421549
commit
29601b84d4
@ -207,7 +207,6 @@ var BaseAppView = GObject.registerClass({
|
|||||||
const scroll = this._scrollView.hscroll;
|
const scroll = this._scrollView.hscroll;
|
||||||
this._adjustment = scroll.adjustment;
|
this._adjustment = scroll.adjustment;
|
||||||
this._adjustment.connect('notify::value', adj => {
|
this._adjustment.connect('notify::value', adj => {
|
||||||
this._updateFade();
|
|
||||||
const value = adj.value / adj.page_size;
|
const value = adj.value / adj.page_size;
|
||||||
this._pageIndicators.setCurrentPosition(value);
|
this._pageIndicators.setCurrentPosition(value);
|
||||||
|
|
||||||
@ -386,40 +385,6 @@ var BaseAppView = GObject.registerClass({
|
|||||||
effect.extend_fade_area = true;
|
effect.extend_fade_area = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
_updateFade() {
|
|
||||||
const { pagePadding } = this._grid.layout_manager;
|
|
||||||
|
|
||||||
if (this._pagesShown)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (pagePadding.top === 0 &&
|
|
||||||
pagePadding.right === 0 &&
|
|
||||||
pagePadding.bottom === 0 &&
|
|
||||||
pagePadding.left === 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
let hOffset = 0;
|
|
||||||
let vOffset = 0;
|
|
||||||
|
|
||||||
if ((this._adjustment.value % this._adjustment.page_size) !== 0.0) {
|
|
||||||
const vertical = this._orientation === Clutter.Orientation.VERTICAL;
|
|
||||||
|
|
||||||
hOffset = vertical ? 0 : Math.max(pagePadding.left, pagePadding.right);
|
|
||||||
vOffset = vertical ? Math.max(pagePadding.top, pagePadding.bottom) : 0;
|
|
||||||
|
|
||||||
if (hOffset === 0 && vOffset === 0)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this._scrollView.update_fade_effect(
|
|
||||||
new Clutter.Margin({
|
|
||||||
left: hOffset,
|
|
||||||
right: hOffset,
|
|
||||||
top: vOffset,
|
|
||||||
bottom: vOffset,
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
_createGrid() {
|
_createGrid() {
|
||||||
return new IconGrid.IconGrid({ allow_incomplete_pages: true });
|
return new IconGrid.IconGrid({ allow_incomplete_pages: true });
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user