Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ AppMenuButton.prototype = {
alloc.natural_size = naturalSize;
},

_contentAllocate: function(actor, box, flags) {
_contentAllocate: function(actor, box) {
let allocWidth = box.x2 - box.x1;
let allocHeight = box.y2 - box.y1;
let childBox = new Clutter.ActorBox();
Expand All @@ -574,7 +574,7 @@ AppMenuButton.prototype = {
childBox.x1 = Math.max(0, allocWidth - naturalWidth);
childBox.x2 = allocWidth;
}
this._iconBox.allocate(childBox, flags);
this._iconBox.allocate(childBox);

let iconWidth = this.iconSize;

Expand All @@ -591,20 +591,20 @@ AppMenuButton.prototype = {
childBox.x2 = allocWidth - Math.floor(iconWidth + 3);
childBox.x1 = Math.max(0, childBox.x2 - naturalWidth);
}
this._label.allocate(childBox, flags);
this._label.allocate(childBox);

if (direction == Clutter.TextDirection.LTR) {
childBox.x1 = Math.floor(iconWidth / 2) + this._label.width;
childBox.x2 = childBox.x1 + this._spinner.actor.width;
childBox.y1 = box.y1;
childBox.y2 = box.y2 - 1;
this._spinner.actor.allocate(childBox, flags);
this._spinner.actor.allocate(childBox);
} else {
childBox.x1 = -this._spinner.actor.width;
childBox.x2 = childBox.x1 + this._spinner.actor.width;
childBox.y1 = box.y1;
childBox.y2 = box.y2 - 1;
this._spinner.actor.allocate(childBox, flags);
this._spinner.actor.allocate(childBox);
}
},

Expand Down Expand Up @@ -1031,7 +1031,7 @@ try {
}
},

_allocateBoxes: function(container, box, flags) {
_allocateBoxes: function(container, box) {
_multirowtaskbarlog("MyApplet._allocateBoxes(" + container + ", " + box);
let allocWidth = box.x2 - box.x1;
let allocHeight = box.y2 - box.y1;
Expand Down Expand Up @@ -1060,13 +1060,13 @@ try {
childBox.x1 = 0;
childBox.x2 = Math.min(allocWidth - rightNaturalWidth, leftNaturalWidth);
}
this._leftBox.allocate(childBox, flags);
this._leftBox.allocate(childBox);

childBox.x1 = Math.ceil(sideWidth);
childBox.y1 = 0;
childBox.x2 = childBox.x1 + centerWidth;
childBox.y2 = allocHeight;
this._centerBox.allocate(childBox, flags);
this._centerBox.allocate(childBox);

childBox.y1 = 0;
childBox.y2 = allocHeight;
Expand All @@ -1079,7 +1079,7 @@ try {
rightNaturalWidth);
childBox.x2 = allocWidth;
}
this._rightBox.allocate(childBox, flags);
this._rightBox.allocate(childBox);
}
};

Expand Down
4 changes: 2 additions & 2 deletions cpufreq@mtwebster/files/cpufreq@mtwebster/panelMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ ButtonBox.prototype = {
}
},

_allocate: function(actor, box, flags) {
_allocate: function(actor, box) {
let children = actor.get_children();
if (children.length == 0)
return;
Expand Down Expand Up @@ -96,7 +96,7 @@ ButtonBox.prototype = {
childBox.y2 = availHeight;
}

child.allocate(childBox, flags);
child.allocate(childBox);
},
}

Expand Down
10 changes: 5 additions & 5 deletions sticky@scollins/files/sticky@scollins/applet.js
Original file line number Diff line number Diff line change
Expand Up @@ -506,14 +506,14 @@ Note.prototype = {
switchTypeMenuItem.connect("activate", Lang.bind(this, this.switchType));
},

allocate: function(actor, box, flags) {
allocate: function(actor, box) {
let childBox = new Clutter.ActorBox();

childBox.x1 = box.x1;
childBox.x2 = box.x2;
childBox.y1 = box.y1;
childBox.y2 = box.y2;
this.textBox.allocate(childBox, flags);
this.textBox.allocate(childBox);
},

getPreferedHeight: function(actor, forWidth, alloc) {
Expand Down Expand Up @@ -1072,7 +1072,7 @@ CheckListItem.prototype = {
else this.entry.remove_style_pseudo_class("checked");
},

allocate: function(actor, box, flags) {
allocate: function(actor, box) {
let height = box.y2 - box.y1;

let cbBox = new Clutter.ActorBox();
Expand Down Expand Up @@ -1103,8 +1103,8 @@ CheckListItem.prototype = {
eBox.y2 = eBox.y1 + eHeight;
}

this.checkBox.actor.allocate(cbBox, flags);
this.entry.allocate(eBox, flags);
this.checkBox.actor.allocate(cbBox);
this.entry.allocate(eBox);
},

getPreferedHeight: function(actor, forWidth, alloc) {
Expand Down
8 changes: 4 additions & 4 deletions window-list@sangorys/files/window-list@sangorys/applet.js
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ class AppMenuButton {
}
}

_allocate(actor, box, flags) {
_allocate(actor, box) {
let allocWidth = box.x2 - box.x1;
let allocHeight = box.y2 - box.y1;

Expand Down Expand Up @@ -1101,7 +1101,7 @@ class AppMenuButton {
childBox.x1 = box.x1 + Math.floor(Math.max(0, allocWidth - naturalWidth) / 2);
childBox.x2 = Math.min(childBox.x1 + naturalWidth, box.x2);
}
this._iconBox.allocate(childBox, flags);
this._iconBox.allocate(childBox);

if (this.drawLabel) {
[minWidth, minHeight, naturalWidth, naturalHeight] = this._label.get_preferred_size();
Expand All @@ -1118,7 +1118,7 @@ class AppMenuButton {
childBox.x1 = box.x1;
}

this._label.allocate(childBox, flags);
this._label.allocate(childBox);
}

if (!this.progressOverlay.visible) {
Expand All @@ -1130,7 +1130,7 @@ class AppMenuButton {
childBox.x2 = this.actor.width;
childBox.y2 = this.actor.height;

this.progressOverlay.allocate(childBox, flags);
this.progressOverlay.allocate(childBox);

let clip_width = Math.max((this.actor.width) * (this._progress / 100.0), 1.0);
this.progressOverlay.set_clip(0, 0, clip_width, this.actor.height);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ class AppMenuButton {
}
}

_allocate(actor, box, flags) {
_allocate(actor, box) {
let allocWidth = box.x2 - box.x1;
let allocHeight = box.y2 - box.y1;

Expand All @@ -710,7 +710,7 @@ class AppMenuButton {
childBox.x1 = box.x1 + Math.floor(Math.max(0, allocWidth - naturalWidth) / 2);
childBox.x2 = Math.min(childBox.x1 + naturalWidth, box.x2);
}
this._iconBox.allocate(childBox, flags);
this._iconBox.allocate(childBox);

if (this.labelVisible) {
[minWidth, minHeight, naturalWidth, naturalHeight] = this._label.get_preferred_size();
Expand All @@ -727,7 +727,7 @@ class AppMenuButton {
childBox.x1 = box.x1;
}

this._label.allocate(childBox, flags);
this._label.allocate(childBox);
}

if (!this.progressOverlay.visible) {
Expand All @@ -739,7 +739,7 @@ class AppMenuButton {
childBox.x2 = this.actor.width;
childBox.y2 = this.actor.height;

this.progressOverlay.allocate(childBox, flags);
this.progressOverlay.allocate(childBox);

let clip_width = Math.max((this.actor.width) * (this._progress / 100.0), 1.0);
this.progressOverlay.set_clip(0, 0, clip_width, this.actor.height);
Expand Down