summaryrefslogtreecommitdiff
path: root/unity-private/panel
diff options
authorMirco Müller <mirco.mueller@ubuntu.com>2010-09-09 09:08:56 +0200
committerMirco Müller <mirco.mueller@ubuntu.com>2010-09-09 09:08:56 +0200
commit42d8872fd342b73c422f3450145a3bddee637cfe (patch)
treed5e9149c56a0bf6a26b760b123603bda277ef140 /unity-private/panel
parent4c907fbe85c6d76b29f74c73a27067bcd1977be8 (diff)
parent0db21b8810a016df59fa97f82f9acb4bea712314 (diff)
modified:
unity-private/panel/panel-home-button.vala Merged unity.fix-630031 branch after review and approval from Jason. There was a regression in the alignment of the home-button groove and the right edge of the launcher. It was off by two pixels. By adding two to the to the query of the launcher-width this is now corrected. Fixes LP: #630031. (bzr r488)
Diffstat (limited to 'unity-private/panel')
-rw-r--r--unity-private/panel/panel-home-button.vala12
1 files changed, 8 insertions, 4 deletions
diff --git a/unity-private/panel/panel-home-button.vala b/unity-private/panel/panel-home-button.vala
index d36abb29d..0bfedc3d5 100644
--- a/unity-private/panel/panel-home-button.vala
+++ b/unity-private/panel/panel-home-button.vala
@@ -110,8 +110,10 @@ namespace Unity.Panel
float lwidth;
float pheight;
Ctk.Padding pad = { 0 };
-
- lwidth = (float) shell.get_launcher_width_foobar ();
+
+ // 2.0f are added so the home-button groove aligns with the
+ // right edge of the launcher, this fixes LP: #630031
+ lwidth = 2.0f + (float) shell.get_launcher_width_foobar ();
pheight = (float) shell.get_panel_height_foobar ();
theme_image.get_preferred_size (out cwidth, out cheight,
out cwidth, out cheight);
@@ -178,8 +180,10 @@ namespace Unity.Panel
out float min_width,
out float nat_width)
{
- min_width = shell.get_launcher_width_foobar ();
- nat_width = shell.get_launcher_width_foobar ();
+ // 2.0f are added so the home-button groove aligns with the
+ // right edge of the launcher, this fixes LP: #630031
+ min_width = 2.0f + shell.get_launcher_width_foobar ();
+ nat_width = 2.0f + shell.get_launcher_width_foobar ();
}
private void on_mode_changed (ShellMode mode)