Merge lp:~hikiko/unity/unity.scale-launcher-at-the-bottom into lp:unity

[Eleni Maria Stea]

sets the YBottomOffset parameter to the scale and expo plugins when the launcher is at the bottom.

uses the scale YBottomOffset parameter to modify the work area when the launcher is placed at the bottom.

Note:
It should be tested with the: lp:~hikiko/compiz/compiz.scale-bottomYoffset compiz branch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4106
http://jenkins.qa.ubuntu.com/job/unity-ci/1437/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/87

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1437/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4108
http://jenkins.qa.ubuntu.com/job/unity-ci/1439/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/89

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1439/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

This is already in, thanks.

review: Disapprove

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-03-31 05:57:11 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-05-10 07:20:36 +0000
@@ -3622,8 +3622,11 @@
       hud_controller_->launcher_locked_out = (launcher_options->hide_mode == LAUNCHER_HIDE_NEVER);
 
       int scale_offset = (launcher_options->hide_mode == LAUNCHER_HIDE_NEVER) ? 0 : launcher_controller_->launcher().GetWidth();
+      int scale_y_bottom_offset = (launcher_options->hide_mode == LAUNCHER_HIDE_NEVER) ? launcher_controller_->launcher().GetWidth() : 0;
       CompOption::Value v(scale_offset);
       screen->setOptionForPlugin("scale", "x_offset", v);
+      CompOption::Value bv(scale_y_bottom_offset);
+      screen->setOptionForPlugin("scale", "y_bottom_offset", bv);
       break;
     }
     case UnityshellOptions::BacklightMode:
@@ -3834,11 +3837,18 @@
     }
 
     auto max_bounds = NuxGeometryFromCompRect(output.workArea());
-    if (launcher_controller_->options()->hide_mode != LAUNCHER_HIDE_NEVER && Settings::Instance().launcher_position() == LauncherPosition::LEFT)
-    {
-      int monitor_width = unity_settings_.LauncherSize(monitor);
-      max_bounds.x += monitor_width;
-      max_bounds.width -= monitor_width;
+    if (launcher_controller_->options()->hide_mode != LAUNCHER_HIDE_NEVER) {
+      if (Settings::Instance().launcher_position() == LauncherPosition::LEFT)
+      {
+        int monitor_width = unity_settings_.LauncherSize(monitor);
+        max_bounds.x += monitor_width;
+        max_bounds.width -= monitor_width;
+      }
+      else if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+      {
+        int launcher_size = unity_settings_.LauncherSize(monitor);
+        max_bounds.height -= launcher_size;
+      }
     }
 
     nux::Geometry final_bounds;
@@ -4098,15 +4108,29 @@
       adjustment_x = launcher_size;
     shortcut_controller_->SetAdjustment(adjustment_x, panel_style_.PanelHeight(launcher->monitor));
 
+    CompOption::Value v(launcher_size);
     if (launcher_position == LauncherPosition::LEFT)
     {
-      CompOption::Value v(launcher_size);
       screen->setOptionForPlugin("expo", "x_offset", v);
 
       if (launcher_controller_->options()->hide_mode == LAUNCHER_HIDE_NEVER)
         v.set(0);
 
       screen->setOptionForPlugin("scale", "x_offset", v);
+      return;
+    }
+
+    if (launcher_position == LauncherPosition::BOTTOM)
+    {
+      CompOption::Value x_offset(0);
+      CompOption::Value y_offset(0);
+      screen->setOptionForPlugin("expo", "x_offset",  x_offset);
+      screen->setOptionForPlugin("scale", "x_offset", x_offset);
+      screen->setOptionForPlugin("scale", "y_offset", y_offset);
+      if (launcher_controller_->options()->hide_mode == LAUNCHER_HIDE_NEVER)
+        v.set(0);
+      screen->setOptionForPlugin("scale", "y_bottom_offset", v);
+      screen->setOptionForPlugin("expo", "y_bottom_offset", v);
     }
   };