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

dash: Make padding even on the top/bottom of the dash

Browse Source 
When Florian landed the new dash container to show the all apps button
always, he got the math wrong -- he forgot to add padding around the
container, and used the height of the box to calculate a y2 position,
rather than the y2 position of the box.

https://bugzilla.gnome.org/show_bug.cgi?id=684619
This commit is contained in:
Jasper St. Pierre 2012-09-22 14:25:02 -03:00
parent e8ab0b3e8f
commit 7206b61838
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/dash.js
View File

@ -324,22 +324,21 @@ const DashActor = new Lang.Class({
vfunc_allocate: function(box, flags) { vfunc_allocate: function(box, flags) {
let contentBox = this.get_theme_node().get_content_box(box); let contentBox = this.get_theme_node().get_content_box(box);
let availWidth = contentBox.x2 - contentBox.x1; let availWidth = contentBox.x2 - contentBox.x1;
let availHeight = contentBox.y2 - contentBox.y1;
this.set_allocation(box, flags); this.set_allocation(box, flags);
let [appIcons, showAppsButton] = this.get_children(); let [appIcons, showAppsButton] = this.get_children();
let [minHeight, natHeight] = showAppsButton.get_preferred_height(availWidth); let [showAppsMinHeight, showAppsNatHeight] = showAppsButton.get_preferred_height(availWidth);
let childBox = new Clutter.ActorBox(); let childBox = new Clutter.ActorBox();
childBox.x1 = 0; childBox.x1 = contentBox.x1;
childBox.x2 = availWidth; childBox.y1 = contentBox.y1;
childBox.y1 = 0; childBox.x2 = contentBox.x2;
childBox.y2 = availHeight - natHeight; childBox.y2 = contentBox.y2 - showAppsNatHeight;
appIcons.allocate(childBox, flags); appIcons.allocate(childBox, flags);
childBox.y1 = availHeight - natHeight; childBox.y1 = contentBox.y2 - showAppsNatHeight;
childBox.y2 = availHeight; childBox.y2 = contentBox.y2;
showAppsButton.allocate(childBox, flags); showAppsButton.allocate(childBox, flags);
} }
}); });