Merge lp:~smspillaz/unity/unity.offset_expo_856112 into lp:unity

[Sam Spilsbury]

Fixes 856112

[Mikkel Kamstrup Erlandsen (kamstrup)]

bzr commit --fixes=lp:856112 -m "Fix bug 856112 'Expo centering need to change when launcher size changed'" && bzr lp-propose -m "See attached bug"

Would have linked the particular commit to the bug, created the mp, and attached the bug to this review. Makes the Desktop team happy. Just saying ;-)

[Sam Spilsbury (smspillaz)]

Thanks, I'll keep that in mind

On Thu, Sep 22, 2011 at 2:41 PM, Mikkel Kamstrup Erlandsen
<email address hidden> wrote:
> bzr commit --fixes=lp:856112 -m "Fix bug 856112 'Expo centering need to change when launcher size changed'" && bzr lp-propose -m "See attached bug"
>
> Would have linked the particular commit to the bug, created the mp, and attached the bug to this review. Makes the Desktop team happy. Just saying ;-)
> --
> https://code.launchpad.net/~smspillaz/unity/unity.offset_expo_856112/+merge/76512
> You are the owner of lp:~smspillaz/unity/unity.offset_expo_856112.
>

--
Sam Spilsbury

[Mirco Müller (macslow)]

Nothing to complain about... works as described... approved.

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-22 01:38:27 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-22 05:21:26 +0000
@@ -1832,9 +1832,30 @@
       launcher->SetBackgroundAlpha(optionGetLauncherOpacity());
       break;
     case UnityshellOptions::IconSize:
+    {
+      CompPlugin         *p = CompPlugin::find ("expo");
+
       launcher->SetIconSize(optionGetIconSize() + 6, optionGetIconSize());
       dashController->launcher_width = optionGetIconSize() + 18;
+
+      if (p)
+      {
+        CompOption::Vector &opts = p->vTable->getOptions ();
+
+        for (CompOption &o : opts)
+        {
+          if (o.name () == std::string ("x_offset"))
+          {
+            CompOption::Value v;
+            v.set (static_cast <int> (optionGetIconSize() + 18));
+
+            screen->setOptionForPlugin (p->vTable->name ().c_str (), o.name ().c_str (), v);
+            break;
+          }
+        }
+      }
       break;
+    }
     case UnityshellOptions::AutohideAnimation:
       launcher->SetAutoHideAnimation((Launcher::AutoHideAnimation) optionGetAutohideAnimation());
       break;