diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index 1240caf04..0eebbe976 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -918,15 +918,6 @@ var BaseAppView = GObject.registerClass({ this._grid.moveItem(item, newPage, newPosition); } - vfunc_allocate(box) { - const width = box.get_width(); - const height = box.get_height(); - - this.adaptToSize(width, height); - - super.vfunc_allocate(box); - } - vfunc_map() { this._swipeTracker.enabled = true; this._connectDnD(); @@ -1011,27 +1002,6 @@ var BaseAppView = GObject.registerClass({ this._grid.goToPage(pageNumber, animate); } - adaptToSize(width, height) { - let box = new Clutter.ActorBox({ - x2: width, - y2: height, - }); - box = this.get_theme_node().get_content_box(box); - box = this._scrollView.get_theme_node().get_content_box(box); - box = this._grid.get_theme_node().get_content_box(box); - - const availWidth = box.get_width(); - const availHeight = box.get_height(); - - this._grid.adaptToSize(availWidth, availHeight); - - const leftPadding = Math.floor( - (availWidth - this._grid.layout_manager.pageWidth) / 2); - this._pageIndicatorOffset = leftPadding; - this._pageArrowOffset = Math.max( - leftPadding - PAGE_PREVIEW_MAX_ARROW_OFFSET, 0); - } - _getIndicatorOffset(page, progress, baseOffset) { const rtl = this.get_text_direction() === Clutter.TextDirection.RTL; const translationX = @@ -1311,14 +1281,6 @@ class AppDisplay extends BaseAppView { super._redisplay(); } - adaptToSize(width, height) { - const [, indicatorHeight] = this._pageIndicators.get_preferred_height(-1); - height -= indicatorHeight; - - this._grid.findBestModeForSize(width, height); - super.adaptToSize(width, height); - } - _savePages() { const pages = []; @@ -2013,10 +1975,6 @@ class FolderGrid extends IconGrid.IconGrid { page_valign: Clutter.ActorAlign.CENTER, }); } - - adaptToSize(width, height) { - this.layout_manager.adaptToSize(width, height); - } }); var FolderView = GObject.registerClass( @@ -2149,13 +2107,6 @@ class FolderView extends BaseAppView { return false; } - adaptToSize(width, height) { - const [, indicatorHeight] = this._pageIndicators.get_preferred_height(-1); - height -= indicatorHeight; - - super.adaptToSize(width, height); - } - _loadApps() { let apps = []; let appSys = Shell.AppSystem.get_default(); diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js index 599374fa3..a5f86fc64 100644 --- a/js/ui/iconGrid.js +++ b/js/ui/iconGrid.js @@ -1207,6 +1207,11 @@ var IconGrid = GObject.registerClass({ delete child._iconGridKeyFocusInId; } + vfunc_allocate(box) { + this.layout_manager.adaptToSize(...box.get_size()); + super.vfunc_allocate(box); + } + vfunc_style_changed() { super.vfunc_style_changed(); @@ -1391,10 +1396,6 @@ var IconGrid = GObject.registerClass({ return this.layout_manager.nPages; } - adaptToSize(width, height) { - this.layout_manager.adaptToSize(width, height); - } - setGridModes(modes) { this._gridModes = modes ? modes : defaultGridModes; this.queue_relayout();