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

Remove ClutterAllocationFlags

Browse Source 
Those flags were removed from Clutter since they're pretty much unused,
so remove them here, too.

See https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1245

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1245
This commit is contained in:
Jonas Dreßler
2020-05-09 21:30:26 +02:00
parent 693dd79d28
commit 9b99b67fea
34 changed files with 142 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/iconGrid.js
View File

@ -197,9 +197,9 @@ function zoomOutActorAtPos(actor, x, y) {
});
}
function animateIconPosition(icon, box, flags, nChangedIcons) {
function animateIconPosition(icon, box, nChangedIcons) {
if (!icon.has_allocation() || icon.allocation.equal(box) || icon.opacity === 0) {
icon.allocate(box, flags);
icon.allocate(box);
return false;
}
@ -207,7 +207,7 @@ function animateIconPosition(icon, box, flags, nChangedIcons) {
icon.set_easing_mode(Clutter.AnimationMode.EASE_OUT_QUAD);
icon.set_easing_delay(nChangedIcons * ICON_POSITION_DELAY);
icon.allocate(box, flags);
icon.allocate(box);
icon.restore_easing_state();
@ -350,8 +350,8 @@ var IconGrid = GObject.registerClass({
return themeNode.adjust_preferred_height(height, height);
}
vfunc_allocate(box, flags) {
this.set_allocation(box, flags);
vfunc_allocate(box) {
this.set_allocation(box);
let themeNode = this.get_theme_node();
box = themeNode.get_content_box(box);
@ -397,7 +397,7 @@ var IconGrid = GObject.registerClass({
if (!animating)
children[i].opacity = 255;
if (animateIconPosition(children[i], childBox, flags, nChangedIcons))
if (animateIconPosition(children[i], childBox, nChangedIcons))
nChangedIcons++;
}
@ -855,11 +855,11 @@ class PaginatedIconGrid extends IconGrid {
return [height, height];
}
vfunc_allocate(box, flags) {
vfunc_allocate(box) {
if (this._childrenPerPage == 0)
log('computePages() must be called before allocate(); pagination will not work.');
this.set_allocation(box, flags);
this.set_allocation(box);
if (this._fillParent) {
// Reset the passed in box to fill the parent
@ -892,7 +892,7 @@ class PaginatedIconGrid extends IconGrid {
for (let i = 0; i < children.length; i++) {
let childBox = this._calculateChildBox(children[i], x, y, box);
if (animateIconPosition(children[i], childBox, flags, nChangedIcons))
if (animateIconPosition(children[i], childBox, nChangedIcons))
nChangedIcons++;
children[i].show();