Merge lp:~azzar1/unity/scale-left-padding into lp:unity

[Andrea Azzarone]

Requires: https://code.launchpad.net/~andyrock/compiz-core/scale-left-padding/+merge/88622. It is needed to fix the bug #893670.

[Sam Spilsbury (smspillaz)]

Now that we are using overlay struts, this isn't necessary anymore.

review: Disapprove

Unmerged revisions

1834. By Andrea Azzarone on 2012-01-14

Uses the correct left padding during the scale.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-01-14 13:05:16 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-01-15 23:26:47 +0000
@@ -2191,27 +2191,46 @@
       break;
     case UnityshellOptions::IconSize:
     {
-      CompPlugin         *p = CompPlugin::find ("expo");
+      CompPlugin* expo = CompPlugin::find("expo");
+      CompPlugin* scale = CompPlugin::find("scale");
 
       launcher.SetIconSize(optionGetIconSize() + 6, optionGetIconSize());
       dash_controller_->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;
-          }
-        }
-      }
+      if (expo)
+      {
+        CompOption::Vector &opts = expo->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 (expo->vTable->name().c_str(), o.name().c_str(), v);
+            break;
+          }
+        }
+      }
+      
+      if (scale)
+      {
+        CompOption::Vector &opts = scale->vTable->getOptions();
+
+        for (CompOption &o : opts)
+        {
+          if (o.name() == std::string("left_padding"))
+          {
+            CompOption::Value v;
+            v.set (static_cast<int>(optionGetIconSize() + 18));
+
+            screen->setOptionForPlugin(scale->vTable->name().c_str(), o.name().c_str(), v);
+            break;
+          }
+        }
+      }
+      
       break;
     }
     case UnityshellOptions::AutohideAnimation: