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

appDisplay: Move adaptToSize call to FolderView

Browse Source 
There is absolutely no need to handle this in the dialog
itself.

Move the call to adaptToSize into FolderView.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1301
This commit is contained in:
Georges Basile Stavracas Neto 2020-06-04 22:10:04 -03:00
parent d4a947b475
commit c790c01a3b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/ui/appDisplay.js
View File

@ -1097,6 +1097,18 @@ class FolderView extends BaseAppView {
this._redisplay(); this._redisplay();
} }
vfunc_allocate(box) {
const node = this.get_theme_node();
const contentBox = node.get_content_box(box);
const [width, height] = contentBox.get_size();
this.adaptToSize(width, height);
this._grid.topPadding = 0;
super.vfunc_allocate(box);
}
_childFocused(actor) { _childFocused(actor) {
Util.ensureActorVisibleInScrollView(this._scrollView, actor); Util.ensureActorVisibleInScrollView(this._scrollView, actor);
} }
@ -1686,18 +1698,6 @@ var AppFolderDialog = GObject.registerClass({
} }
vfunc_allocate(box) { vfunc_allocate(box) {
let contentBox = this.get_theme_node().get_content_box(box);
contentBox = this._viewBox.get_theme_node().get_content_box(contentBox);
let [, entryBoxHeight] = this._entryBox.get_size();
let spacing = this._viewBox.layout_manager.spacing;
this._view.adaptToSize(
contentBox.get_width(),
contentBox.get_height() - entryBoxHeight - spacing);
this._view._grid.topPadding = 0;
super.vfunc_allocate(box); super.vfunc_allocate(box);
// We can only start zooming after receiving an allocation // We can only start zooming after receiving an allocation