Merge lp:~azzar1/unity/810315 into lp:unity

[Andrea Azzarone]

Tries to resolve bug #810315. Since scale plugin takes into account the workarea, and the workarea take into account the struts,it just makes Launcher a struts until spread is active.

See bug report #810315 to reproduce/test the bug/bug-fix.

[Gord Allott (gordallott)]

rejecting as the bug is invalid, sorry =\

review: Disapprove

[Gord Allott (gordallott)]

review: Approve

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-07-10 09:53:43 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-07-14 08:45:16 +0000
@@ -2037,6 +2037,14 @@
 {
   _hide_machine->SetQuirk (LauncherHideMachine::EXPO_ACTIVE, PluginAdapter::Default ()->IsExpoActive ());
   _hide_machine->SetQuirk (LauncherHideMachine::SCALE_ACTIVE, PluginAdapter::Default ()->IsScaleActive ());
+  
+  if (_hidemode == LAUNCHER_HIDE_NEVER)
+    return;
+    
+  if (PluginAdapter::Default ()->IsScaleActive ())                   
+    _parent->InputWindowEnableStruts (true);
+  else
+    _parent->InputWindowEnableStruts (false);
 }
 
 Launcher::LauncherHideMode Launcher::GetHideMode ()