Fix misuse of ShellGenericContainerAllocation in two places
This commit is contained in:
parent
e3be74a31a
commit
df48e9d1c0
@ -512,7 +512,7 @@ SwitcherList.prototype = {
|
|||||||
|
|
||||||
let totalSpacing = this._list.spacing * (this._items.length - 1);
|
let totalSpacing = this._list.spacing * (this._items.length - 1);
|
||||||
alloc.min_size = this._items.length * maxChildMin + separatorWidth + totalSpacing;
|
alloc.min_size = this._items.length * maxChildMin + separatorWidth + totalSpacing;
|
||||||
alloc.nat_size = this._items.length * maxChildNat + separatorWidth + totalSpacing;
|
alloc.natural_size = this._items.length * maxChildNat + separatorWidth + totalSpacing;
|
||||||
},
|
},
|
||||||
|
|
||||||
_getPreferredHeight: function (actor, forWidth, alloc) {
|
_getPreferredHeight: function (actor, forWidth, alloc) {
|
||||||
@ -532,7 +532,7 @@ SwitcherList.prototype = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
alloc.min_size = maxChildMin;
|
alloc.min_size = maxChildMin;
|
||||||
alloc.nat_size = maxChildNat;
|
alloc.natural_size = maxChildNat;
|
||||||
},
|
},
|
||||||
|
|
||||||
_allocate: function (actor, box, flags) {
|
_allocate: function (actor, box, flags) {
|
||||||
|
@ -747,7 +747,7 @@ SingleView.prototype = {
|
|||||||
width = children[i].x + children[i].width;
|
width = children[i].x + children[i].width;
|
||||||
}
|
}
|
||||||
alloc.min_size = width;
|
alloc.min_size = width;
|
||||||
alloc.nat_size = width;
|
alloc.natural_size = width;
|
||||||
}));
|
}));
|
||||||
this._indicatorsPanel.connect('get-preferred-height', Lang.bind(this, function (actor, fw, alloc) {
|
this._indicatorsPanel.connect('get-preferred-height', Lang.bind(this, function (actor, fw, alloc) {
|
||||||
let children = actor.get_children();
|
let children = actor.get_children();
|
||||||
@ -755,7 +755,7 @@ SingleView.prototype = {
|
|||||||
if (children.length)
|
if (children.length)
|
||||||
height = children[0].height;
|
height = children[0].height;
|
||||||
alloc.min_size = height;
|
alloc.min_size = height;
|
||||||
alloc.nat_size = height;
|
alloc.natural_size = height;
|
||||||
}));
|
}));
|
||||||
this._indicatorsPanel.connect('allocate', Lang.bind(this, function (actor, box, flags) {
|
this._indicatorsPanel.connect('allocate', Lang.bind(this, function (actor, box, flags) {
|
||||||
let children = actor.get_children();
|
let children = actor.get_children();
|
||||||
|
Loading…
Reference in New Issue
Block a user