Merge lp:~feng-kylin/unity/MoveDashToBottom into lp:unity

[handsome_feng]

Dash: move it down when the launcher is positioned at the bottom.

Move the dash to the bottom.

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

Please revert the changes to PanelView, because some reasons:
 1) You should disconnect from form_factor changes (or expect crashes)
 2) The way is done right now will affect Hud as well
 3) After thinking again, I've the impression that it's better to keep the
    panel blurred, also when the dash is at the bottom, because it's a way
    to underline that panel is controlling the dash.

So, other than that (and the small change in OverlayRenderer and DashStyle if you want) I think we're ok to go.

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

Ah, also this black edge: http://i.imgur.com/OyNzmFz.png

This can be fixed even later, but I guess it's just about to use the proper mask.

[handsome_feng (feng-kylin)]

hi, Marco, I have update the code, and I know that time is running out.
But unfortunately, I found an AP test error in test_wm_keybindings.WindowManagerKeybindingsForWindowHandling.test_right_maximize
and test_left_maximize, the self.screen_win.height didn't match workarea_geo[3].
There is a 2 pixels difference... :/

and BTW, how about the bug of overlapped tooltip ?

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

> hi, Marco, I have update the code, and I know that time is running out.
> But unfortunately, I found an AP test error in test_wm_keybindings.WindowManag
> erKeybindingsForWindowHandling.test_right_maximize
> and test_left_maximize, the self.screen_win.height didn't match
> workarea_geo[3].
> There is a 2 pixels difference... :/

Ok, I can check that.

> and BTW, how about the bug of overlapped tooltip ?

I can't reproduce that, do you have a proper method?
However it seems something we can fix in a different branch.

review: Approve

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

I can't reproduce that, do you have a proper method?
> However it seems something we can fix in a different branch.

Ok, I've noticed what you mean now... The thing is that the new tooltip is opened before the old one is closed, and thus, there's a double blurred background. Now, this doesn't happen in vertical mode because there's no overlapping area. Since the damage events arrives with some delay, there's glitch.

So, in order to get that working we need to quickly hide the tooltips when in horizontal mode.
This is one way: http://pastebin.ubuntu.com/15391195/

So please apply that diff, although you need to fix tests for that to work (I've just built it for testing purposes).
Also instead of "virtual void HideTooltip(bool prompt = false) = 0" in AbstractLauncherIcon maybe it's better if you add a new "virtual void PromptHideTooltip()" or better.

But this should give you an idea.

[handsome_feng (feng-kylin)]

I apply the diff , but the unity will crash when call "animation::Skip(fade_animator_)", :/

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

I've noticed a tiny issue when using the keynav with quicklist...

By using left/right arrows the keynav should move selection to the next icon.

This should give you an idea of what I mean: http://pastebin.ubuntu.com/15407034/

We've again a similar issue as we had for the tooltip in this case, but now you kno whow to fix it, so I guess you can finish it up quite easily :)

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

Err fixed some white spacing: http://pastebin.ubuntu.com/15407037/

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

Again... Fixing the double-blur thing was just about calling PromptHide, so this is what you need: http://pastebin.ubuntu.com/15407049/

Feel free to clean this up by adding methods, if you want.

[handsome_feng (feng-kylin)]

About the Skip() method, I tried rebuilding the whole stuff,But the unity still crashed,
So I keep the Stop() method, and this works fine.

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

> About the Skip() method, I tried rebuilding the whole stuff,But the unity
> still crashed,
> So I keep the Stop() method, and this works fine.

Ok, fair enough.

Once you've updated lp:~feng-kylin/unity/unityshell-rotated-kylin/+merge/281182, please merge this with that as well.

[handsome_feng (feng-kylin)]

> > About the Skip() method, I tried rebuilding the whole stuff,But the unity
> > still crashed,
> > So I keep the Stop() method, and this works fine.
>
> Ok, fair enough.
>
> Once you've updated lp:~feng-kylin/unity/unityshell-rotated-
> kylin/+merge/281182, please merge this with that as well.

Done.

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2016-03-18 07:01:34 +0000
+++ dash/DashController.cpp	2016-03-18 07:01:34 +0000
@@ -230,22 +230,22 @@
 nux::Geometry Controller::GetIdealWindowGeometry()
 {
   UScreen *uscreen = UScreen::GetDefault();
-  auto ideal_geo = uscreen->GetMonitorGeometry(GetIdealMonitor());
+  auto monitor_geo = uscreen->GetMonitorGeometry(GetIdealMonitor());
   int launcher_size = unity::Settings::Instance().LauncherSize(monitor_);
 
   // We want to cover as much of the screen as possible to grab any mouse events outside
   // of our window
   if (Settings::Instance().launcher_position() == LauncherPosition::LEFT)
   {
-    ideal_geo.x += launcher_size;
-    ideal_geo.width -= launcher_size;
+    monitor_geo.x += launcher_size;
+    monitor_geo.width -= launcher_size;
   }
   else
   {
-    ideal_geo.height -= launcher_size;
+    monitor_geo.height -= launcher_size;
   }
 
-  return ideal_geo;
+  return monitor_geo;
 }
 
 void Controller::OnMonitorChanged(int primary, std::vector<nux::Geometry> const& monitors)
@@ -278,6 +278,12 @@
   {
     left_offset = launcher_size;
   }
+  else if (launcher_position == LauncherPosition::BOTTOM &&
+           Settings::Instance().form_factor() == FormFactor::DESKTOP)
+  {
+    auto const& monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor_);
+    top_offset = monitor_geo.height - view_->GetContentGeometry().height - launcher_size;
+  }
 
   view_->SetMonitorOffset(left_offset, top_offset);
 }
@@ -489,6 +495,8 @@
 nux::Geometry Controller::GetInputWindowGeometry()
 {
   EnsureDash();
+  int launcher_size = Settings::Instance().LauncherSize(monitor_);
+  auto const& monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor_);
   dash::Style& style = dash::Style::Instance();
   nux::Geometry const& window_geo(window_->GetGeometry());
   nux::Geometry const& view_content_geo(view_->GetContentGeometry());
@@ -499,6 +507,15 @@
   {
     geo.width += style.GetDashVerticalBorderWidth().CP(view_->scale());
     geo.height += style.GetDashHorizontalBorderHeight().CP(view_->scale());
+
+    if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+      geo.y = monitor_geo.height - view_content_geo.height - launcher_size - style.GetDashHorizontalBorderHeight().CP(view_->scale());
+  }
+  else if (Settings::Instance().form_factor() == FormFactor::NETBOOK)
+  {
+    geo.height = monitor_geo.height;
+    if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+      geo.height -= launcher_size;
   }
 
   return geo;
 
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2016-02-17 18:40:53 +0000
+++ dash/DashView.cpp	2016-03-18 07:01:34 +0000
@@ -133,6 +133,7 @@
   , monitor_(0)
 {
   renderer_.SetOwner(this);
+  renderer_.owner_type = OverlayOwner::Dash;
   renderer_.need_redraw.connect([this] () {
     QueueDraw();
   });
@@ -650,7 +651,20 @@
   ubus_manager_.SendMessage(UBUS_DASH_SIZE_CHANGED, g_variant_new("(ii)", content_geo_.width, content_geo_.height));
 
   if (preview_displaying_)
-    preview_container_->SetGeometry(layout_->GetGeometry());
+  {
+    if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+    {
+      auto preview_geo = content_geo_;
+      int padding = style.GetDashHorizontalBorderHeight().CP(scale());
+      preview_geo.y += padding;
+      preview_geo.height -= padding;
+      preview_container_->SetGeometry(preview_geo);
+    }
+    else
+    {
+      preview_container_->SetGeometry(layout_->GetGeometry());
+    }
+  }
 
   renderer_.UpdateBlurBackgroundSize(content_geo_, GetRenderAbsoluteGeometry(), false);
 
@@ -729,6 +743,8 @@
   // See lp bug: 1125346 (The sharp white line between dash and launcher is missing)
   nux::Geometry clip_geo = geo_layout;
   clip_geo.x += 1;
+  if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+    clip_geo.y += renderer_y_offset;
   graphics_engine.PushClippingRectangle(clip_geo);
 
   if (IsFullRedraw())
 
=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2014-07-11 01:45:24 +0000
+++ hud/HudView.cpp	2016-03-18 07:01:34 +0000
@@ -73,6 +73,7 @@
   scale = Settings::Instance().em()->DPIScale();
   renderer_.scale = scale();
   renderer_.SetOwner(this);
+  renderer_.owner_type = OverlayOwner::Hud;
   renderer_.need_redraw.connect([this] () {
     QueueDraw();
   });
 
=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2015-11-25 23:16:11 +0000
+++ launcher/AbstractLauncherIcon.h	2016-03-18 07:01:34 +0000
@@ -144,6 +144,7 @@
 
   virtual void ShowTooltip() = 0;
   virtual void HideTooltip() = 0;
+  virtual void PromptHideTooltip() = 0;
 
   virtual void    SetShortcut(guint64 shortcut) = 0;
 
 
=== modified file 'launcher/CairoBaseWindow.cpp'
--- launcher/CairoBaseWindow.cpp	2014-02-25 18:41:37 +0000
+++ launcher/CairoBaseWindow.cpp	2016-03-18 07:01:34 +0000
@@ -73,6 +73,12 @@
   animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
 }
 
+void CairoBaseWindow::PromptHide()
+{
+  Hide();
+  fade_animator_.Stop();
+}
+
 void CairoBaseWindow::RedrawBlur()
 {
   compute_blur_bkg_ = true;
 
=== modified file 'launcher/CairoBaseWindow.h'
--- launcher/CairoBaseWindow.h	2014-02-25 18:41:37 +0000
+++ launcher/CairoBaseWindow.h	2016-03-18 07:01:34 +0000
@@ -35,6 +35,7 @@
 
   virtual void Show();
   virtual void Hide();
+  void PromptHide();
 
   void RedrawBlur();
   bool HasBlurredBackground() const;
 
=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2016-03-18 07:01:34 +0000
+++ launcher/Launcher.h	2016-03-18 07:01:34 +0000
@@ -43,7 +43,6 @@
 #include "LauncherHoverMachine.h"
 #include "unity-shared/MockableBaseWindow.h"
 #include "unity-shared/UBusWrapper.h"
-#include "unity-shared/UnitySettings.h"
 #include "SoftwareCenterLauncherIcon.h"
 #include "TooltipManager.h"
 
@@ -54,6 +53,8 @@
 
 namespace unity
 {
+enum class LauncherPosition;
+
 namespace launcher
 {
 extern const char* window_title;
 
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2016-03-18 07:01:34 +0000
+++ launcher/LauncherController.cpp	2016-03-18 07:01:34 +0000
@@ -180,6 +180,18 @@
     }
   });
 
+  ubus.RegisterInterest(UBUS_LAUNCHER_NEXT_KEY_NAV, [this] (GVariant*) {
+    parent_->KeyNavNext();
+  });
+
+  ubus.RegisterInterest(UBUS_LAUNCHER_PREV_KEY_NAV, [this] (GVariant*) {
+    parent_->KeyNavPrevious();
+  });
+
+  ubus.RegisterInterest(UBUS_LAUNCHER_OPEN_QUICKLIST, [this] (GVariant*) {
+    OpenQuicklist();
+  });
+
   parent_->AddChild(model_.get());
 
   xdnd_manager_->dnd_started.connect(sigc::mem_fun(this, &Impl::OnDndStarted));
 
=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2016-03-18 07:01:34 +0000
+++ launcher/LauncherIcon.cpp	2016-03-18 07:01:34 +0000
@@ -645,6 +645,14 @@
   tooltip_visible.emit(nux::ObjectPtr<nux::View>());
 }
 
+void LauncherIcon::PromptHideTooltip()
+{
+  if (_tooltip)
+    _tooltip->PromptHide();
+
+  tooltip_visible.emit(nux::ObjectPtr<nux::View>());
+}
+
 void LauncherIcon::SetCenter(nux::Point3 const& new_center, int monitor)
 {
   nux::Point3& center = _center[monitor];
 
=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2016-02-25 15:59:41 +0000
+++ launcher/LauncherIcon.h	2016-03-18 07:01:34 +0000
@@ -70,6 +70,7 @@
   void RecvMouseClick(int button, int monitor, unsigned long key_flags = 0);
 
   void HideTooltip();
+  void PromptHideTooltip();
 
   void ShowTooltip();
 
 
=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2015-11-25 23:16:11 +0000
+++ launcher/MockLauncherIcon.h	2016-03-18 07:01:34 +0000
@@ -87,6 +87,7 @@
 
   void ShowTooltip() { is_tooltip_visible_ = true; }
   void HideTooltip() { is_tooltip_visible_ = false; }
+  void PromptHideTooltip() { is_tooltip_visible_ = false; }
   bool IsTooltipVisible() { return is_tooltip_visible_; }
 
   void    SetShortcut(guint64 shortcut) {}
 
=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2016-03-18 07:01:34 +0000
+++ launcher/QuicklistView.cpp	2016-03-18 07:01:34 +0000
@@ -325,7 +325,32 @@
       // left (close quicklist, go back to laucher key-nav)
     case NUX_VK_LEFT:
     case NUX_KP_LEFT:
-      HideAndEndQuicklistNav();
+
+      if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+      {
+        PromptHide();
+        UBusManager::SendMessage(UBUS_QUICKLIST_END_KEY_NAV);
+        UBusManager::SendMessage(UBUS_LAUNCHER_PREV_KEY_NAV);
+        UBusManager::SendMessage(UBUS_LAUNCHER_OPEN_QUICKLIST);
+      }
+      else
+      {
+        HideAndEndQuicklistNav();
+      }
+
+      break;
+
+      // right (close quicklist, go back to launcher key-nav)
+    case NUX_VK_RIGHT:
+    case NUX_KP_RIGHT:
+      if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+      {
+        PromptHide();
+        UBusManager::SendMessage(UBUS_QUICKLIST_END_KEY_NAV);
+        UBusManager::SendMessage(UBUS_LAUNCHER_NEXT_KEY_NAV);
+        UBusManager::SendMessage(UBUS_LAUNCHER_OPEN_QUICKLIST);
+      }
+
       break;
 
       // esc (close quicklist, exit key-nav)
 
=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2016-03-18 07:01:34 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2016-02-23 15:39:49 +0000
@@ -31,7 +31,6 @@
 #include "LauncherDragWindow.h"
 #include "LauncherModel.h"
 #include "DesktopUtilities.h"
-#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
 
=== modified file 'launcher/TooltipManager.cpp'
--- launcher/TooltipManager.cpp	2013-11-14 03:00:29 +0000
+++ launcher/TooltipManager.cpp	2016-03-18 07:01:34 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "TooltipManager.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -40,7 +41,12 @@
 
   StopTimer();
   if (icon_)
-    icon_->HideTooltip();
+  {
+    if (Settings::Instance().launcher_position() == LauncherPosition::LEFT)
+      icon_->HideTooltip();
+    else
+      icon_->PromptHideTooltip();
+  }
 
   icon_ = icon_under_mouse;
 
 
=== added file 'resources/dash_bottom_right_corner_rotated.png'
 Binary files resources/dash_bottom_right_corner_rotated.png	1970-01-01 00:00:00 +0000 and resources/dash_bottom_right_corner_rotated.png	2016-03-18 07:01:34 +0000 differ
=== added file 'resources/dash_bottom_right_corner_rotated_mask.png'
 Binary files resources/dash_bottom_right_corner_rotated_mask.png	1970-01-01 00:00:00 +0000 and resources/dash_bottom_right_corner_rotated_mask.png	2016-03-18 07:01:34 +0000 differ
=== added file 'resources/dash_bottom_tile.png'
 Binary files resources/dash_bottom_tile.png	1970-01-01 00:00:00 +0000 and resources/dash_bottom_tile.png	2016-03-18 07:01:34 +0000 differ
=== added file 'resources/dash_top_border_tile.png'
 Binary files resources/dash_top_border_tile.png	1970-01-01 00:00:00 +0000 and resources/dash_top_border_tile.png	2016-03-18 07:01:34 +0000 differ
=== added file 'resources/dash_top_border_tile_mask.png'
 Binary files resources/dash_top_border_tile_mask.png	1970-01-01 00:00:00 +0000 and resources/dash_top_border_tile_mask.png	2016-03-18 07:01:34 +0000 differ
=== added file 'resources/dash_top_left_corner.png'
 Binary files resources/dash_top_left_corner.png	1970-01-01 00:00:00 +0000 and resources/dash_top_left_corner.png	2016-03-18 07:01:34 +0000 differ
=== added file 'resources/dash_top_left_corner_mask.png'
 Binary files resources/dash_top_left_corner_mask.png	1970-01-01 00:00:00 +0000 and resources/dash_top_left_corner_mask.png	2016-03-18 07:01:34 +0000 differ
=== added file 'resources/dash_top_right_corner_rotated.png'
 Binary files resources/dash_top_right_corner_rotated.png	1970-01-01 00:00:00 +0000 and resources/dash_top_right_corner_rotated.png	2016-03-18 07:01:34 +0000 differ
=== added file 'resources/dash_top_right_corner_rotated_mask.png'
 Binary files resources/dash_top_right_corner_rotated_mask.png	1970-01-01 00:00:00 +0000 and resources/dash_top_right_corner_rotated_mask.png	2016-03-18 07:01:34 +0000 differ
=== modified file 'tests/autopilot/unity/tests/launcher/test_keynav.py'
--- tests/autopilot/unity/tests/launcher/test_keynav.py	2016-03-18 07:01:34 +0000
+++ tests/autopilot/unity/tests/launcher/test_keynav.py	2016-03-18 07:01:34 +0000
@@ -13,6 +13,7 @@
 import logging
 from testtools.matchers import Equals, GreaterThan
 
+from unity.emulators.launcher import LauncherPosition
 from unity.tests.launcher import LauncherTestCase
 
 logger = logging.getLogger(__name__)
@@ -114,10 +115,12 @@
         self.addCleanup(self.keyboard.press_and_release, "Escape")
         self.launcher_instance.key_nav_enter_quicklist(self.launcher_position)
         self.assertThat(self.launcher_instance.quicklist_open, Eventually(Equals(True)))
-        self.launcher_instance.key_nav_exit_quicklist()
-        self.assertThat(self.launcher_instance.quicklist_open, Eventually(Equals(False)))
-        self.assertThat(self.unity.launcher.key_nav_is_active, Eventually(Equals(True)))
-        self.assertThat(self.unity.launcher.key_nav_is_grabbed, Eventually(Equals(True)))
+        # We can't close a quicklist from keynav mode when launcher at bottom.
+        if self.launcher_position == LauncherPosition.LEFT:
+            self.launcher_instance.key_nav_exit_quicklist()
+            self.assertThat(self.launcher_instance.quicklist_open, Eventually(Equals(False)))
+            self.assertThat(self.unity.launcher.key_nav_is_active, Eventually(Equals(True)))
+            self.assertThat(self.unity.launcher.key_nav_is_grabbed, Eventually(Equals(True)))
 
     def test_launcher_keynav_mode_toggles(self):
         """Tests that keynav mode toggles with Alt+F1."""
 
=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2016-03-18 07:01:34 +0000
+++ tests/test_launcher.cpp	2016-03-18 07:01:34 +0000
@@ -62,6 +62,7 @@
   MOCK_METHOD1(Stick, void(bool));
   MOCK_METHOD2(PerformScroll, void(ScrollDirection, Time));
   MOCK_METHOD0(HideTooltip, void());
+  MOCK_METHOD0(PromptHideTooltip, void());
   MOCK_METHOD3(SetQuirk, void(ApplicationLauncherIcon::Quirk, bool, int));
   MOCK_METHOD2(SetQuirk, void(ApplicationLauncherIcon::Quirk, bool));
   MOCK_METHOD2(SkipQuirkAnimation, void(ApplicationLauncherIcon::Quirk, int));
 
=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2016-03-10 10:09:12 +0000
+++ unity-shared/DashStyle.cpp	2016-03-18 07:01:34 +0000
@@ -2082,14 +2082,24 @@
   return true;
 }
 
-BaseTexturePtr Style::GetDashBottomTile(double scale) const
+BaseTexturePtr Style::GetDashHorizontalTile(double scale, DashPosition dash_position) const
 {
-  return pimpl->LoadScaledTexture("dash_bottom_border_tile.png", scale);
+  std::string horizontal_tile;
+  if (dash_position == DashPosition::BOTTOM)
+    horizontal_tile = "dash_top_border_tile.png";
+  else
+    horizontal_tile = "dash_bottom_border_tile.png";
+  return pimpl->LoadScaledTexture(horizontal_tile, scale);
 }
 
-BaseTexturePtr Style::GetDashBottomTileMask(double scale) const
+BaseTexturePtr Style::GetDashHorizontalTileMask(double scale, DashPosition dash_position) const
 {
-  return pimpl->LoadScaledTexture("dash_bottom_border_tile_mask.png", scale);
+  std::string horizontal_tile_mask;
+  if (dash_position == DashPosition::BOTTOM)
+    horizontal_tile_mask = "dash_top_border_tile_mask.png";
+  else
+    horizontal_tile_mask = "dash_bottom_border_tile_mask.png";
+  return pimpl->LoadScaledTexture(horizontal_tile_mask, scale);
 }
 
 BaseTexturePtr Style::GetDashRightTile(double scale) const
@@ -2107,39 +2117,74 @@
   return pimpl->LoadScaledTexture("dash_left_tile.png", scale);
 }
 
-BaseTexturePtr Style::GetDashTopTile(double scale) const
-{
-  return pimpl->LoadScaledTexture("dash_top_tile.png", scale);
-}
-
-BaseTexturePtr Style::GetDashCorner(double scale) const
-{
-  return pimpl->LoadScaledTexture("dash_bottom_right_corner.png", scale);
-}
-
-BaseTexturePtr Style::GetDashCornerMask(double scale) const
-{
-  return pimpl->LoadScaledTexture("dash_bottom_right_corner_mask.png", scale);
-}
-
-BaseTexturePtr Style::GetDashLeftCorner(double scale) const
-{
-  return pimpl->LoadScaledTexture("dash_bottom_left_corner.png", scale);
-}
-
-BaseTexturePtr Style::GetDashLeftCornerMask(double scale) const
-{
-  return pimpl->LoadScaledTexture("dash_bottom_left_corner_mask.png", scale);
-}
-
-BaseTexturePtr Style::GetDashTopCorner(double scale) const
-{
-  return pimpl->LoadScaledTexture("dash_top_right_corner.png", scale);
-}
-
-BaseTexturePtr Style::GetDashTopCornerMask(double scale) const
-{
-  return pimpl->LoadScaledTexture("dash_top_right_corner_mask.png", scale);
+BaseTexturePtr Style::GetDashTopOrBottomTile(double scale, DashPosition dash_position) const
+{
+  std::string top_bottom_tile;
+  if (dash_position == DashPosition::BOTTOM)
+    top_bottom_tile = "dash_bottom_tile.png";
+  else
+    top_bottom_tile = "dash_top_tile.png";
+  return pimpl->LoadScaledTexture(top_bottom_tile, scale);
+}
+
+BaseTexturePtr Style::GetDashCorner(double scale, DashPosition dash_position) const
+{
+  std::string corner;
+  if (dash_position == DashPosition::BOTTOM)
+    corner = "dash_top_right_corner_rotated.png";
+  else
+    corner = "dash_bottom_right_corner.png";
+  return pimpl->LoadScaledTexture(corner, scale);
+}
+
+BaseTexturePtr Style::GetDashCornerMask(double scale, DashPosition dash_position) const
+{
+  std::string corner_mask;
+  if (dash_position == DashPosition::BOTTOM)
+    corner_mask = "dash_top_right_corner_rotated_mask.png";
+  else
+    corner_mask = "dash_bottom_right_corner_mask.png";
+  return pimpl->LoadScaledTexture(corner_mask, scale);
+}
+
+BaseTexturePtr Style::GetDashLeftCorner(double scale, DashPosition dash_position) const
+{
+  std::string left_corner;
+  if (dash_position == DashPosition::BOTTOM)
+    left_corner = "dash_top_left_corner.png";
+  else
+    left_corner = "dash_bottom_left_corner.png";
+  return pimpl->LoadScaledTexture(left_corner, scale);
+}
+
+BaseTexturePtr Style::GetDashLeftCornerMask(double scale, DashPosition dash_position) const
+{
+  std::string left_corner_mask;
+  if (dash_position == DashPosition::BOTTOM)
+    left_corner_mask = "dash_top_left_corner_mask.png";
+  else
+    left_corner_mask = "dash_bottom_left_corner_mask.png";
+  return pimpl->LoadScaledTexture(left_corner_mask, scale);
+}
+
+BaseTexturePtr Style::GetDashRightCorner(double scale, DashPosition dash_position) const
+{
+  std::string right_corner;
+  if (dash_position == DashPosition::BOTTOM)
+    right_corner = "dash_bottom_right_corner_rotated.png";
+  else
+    right_corner = "dash_top_right_corner.png";
+  return pimpl->LoadScaledTexture(right_corner, scale);
+}
+
+BaseTexturePtr Style::GetDashRightCornerMask(double scale, DashPosition dash_position) const
+{
+  std::string right_corner_mask;
+  if (dash_position == DashPosition::BOTTOM)
+    right_corner_mask = "dash_bottom_right_corner_rotated_mask.png";
+  else
+    right_corner_mask = "dash_top_right_corner_mask.png";
+  return pimpl->LoadScaledTexture(right_corner_mask, scale);
 }
 
 BaseTexturePtr Style::GetSearchMagnifyIcon(double scale) const
 
=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2016-03-10 10:09:12 +0000
+++ unity-shared/DashStyle.h	2016-03-18 07:01:34 +0000
@@ -85,6 +85,10 @@
   NONE
 };
 
+enum class DashPosition {
+  LEFT,
+  BOTTOM
+};
 
 class Style : public StyleInterface
 {
@@ -168,19 +172,19 @@
   BaseTexturePtr const& GetCategoryBackground() const;
   BaseTexturePtr const& GetCategoryBackgroundNoFilters() const;
 
-  BaseTexturePtr GetDashBottomTile(double scale) const;
-  BaseTexturePtr GetDashBottomTileMask(double scale) const;
+  BaseTexturePtr GetDashHorizontalTile(double scale, DashPosition dash_position) const;
+  BaseTexturePtr GetDashHorizontalTileMask(double scale, DashPosition dash_position) const;
   BaseTexturePtr GetDashRightTile(double scale) const;
   BaseTexturePtr GetDashRightTileMask(double scale) const;
   BaseTexturePtr GetDashLeftTile(double scale) const;
-  BaseTexturePtr GetDashTopTile(double scale) const;
+  BaseTexturePtr GetDashTopOrBottomTile(double scale, DashPosition dash_position) const;
 
-  BaseTexturePtr GetDashCorner(double scale) const;
-  BaseTexturePtr GetDashCornerMask(double scale) const;
-  BaseTexturePtr GetDashLeftCorner(double scale) const;
-  BaseTexturePtr GetDashLeftCornerMask(double scale) const;
-  BaseTexturePtr GetDashTopCorner(double scale) const;
-  BaseTexturePtr GetDashTopCornerMask(double scale) const;
+  BaseTexturePtr GetDashCorner(double scale, DashPosition dash_position) const;
+  BaseTexturePtr GetDashCornerMask(double scale, DashPosition dash_position) const;
+  BaseTexturePtr GetDashLeftCorner(double scale, DashPosition dash_position) const;
+  BaseTexturePtr GetDashLeftCornerMask(double scale, DashPosition dash_position) const;
+  BaseTexturePtr GetDashRightCorner(double scale, DashPosition dash_position) const;
+  BaseTexturePtr GetDashRightCornerMask(double scale, DashPosition dash_position) const;
 
   RawPixel GetDashHorizontalBorderHeight() const;
   RawPixel GetDashVerticalBorderWidth() const;
 
=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2015-04-21 15:12:02 +0000
+++ unity-shared/OverlayRenderer.cpp	2016-03-18 07:01:34 +0000
@@ -26,7 +26,9 @@
 
 #include "DashStyle.h"
 #include "unity-shared/BackgroundEffectHelper.h"
+#include "unity-shared/PanelStyle.h"
 #include "unity-shared/UnitySettings.h"
+#include "unity-shared/UScreen.h"
 #include "unity-shared/WindowManager.h"
 
 
@@ -75,19 +77,19 @@
 
   std::unique_ptr<nux::TextureLayer> bg_refine_gradient_;
 
-  nux::ObjectPtr<nux::BaseTexture> bottom_texture_;
-  nux::ObjectPtr<nux::BaseTexture> bottom_texture_mask_;
+  nux::ObjectPtr<nux::BaseTexture> horizontal_texture_;
+  nux::ObjectPtr<nux::BaseTexture> horizontal_texture_mask_;
   nux::ObjectPtr<nux::BaseTexture> right_texture_;
   nux::ObjectPtr<nux::BaseTexture> right_texture_mask_;
   nux::ObjectPtr<nux::BaseTexture> left_texture_;
-  nux::ObjectPtr<nux::BaseTexture> top_texture_;
+  nux::ObjectPtr<nux::BaseTexture> top_bottom_texture_;
 
   nux::ObjectPtr<nux::BaseTexture> corner_;
   nux::ObjectPtr<nux::BaseTexture> corner_mask_;
   nux::ObjectPtr<nux::BaseTexture> left_corner_;
   nux::ObjectPtr<nux::BaseTexture> left_corner_mask_;
-  nux::ObjectPtr<nux::BaseTexture> top_corner_;
-  nux::ObjectPtr<nux::BaseTexture> top_corner_mask_;
+  nux::ObjectPtr<nux::BaseTexture> right_corner_;
+  nux::ObjectPtr<nux::BaseTexture> right_corner_mask_;
 
   // temporary variable that stores the number of backgrounds we have rendered
   int bgs;
@@ -116,7 +118,9 @@
 {
   parent->scale = Settings::Instance().em()->DPIScale();
   parent->scale.changed.connect(sigc::hide(sigc::mem_fun(this, &OverlayRendererImpl::LoadScaledTextures)));
+  parent->owner_type.changed.connect(sigc::hide(sigc::mem_fun(this, &OverlayRendererImpl::LoadScaledTextures)));
   Settings::Instance().low_gfx_changed.connect(sigc::mem_fun(this, &OverlayRendererImpl::UpdateTextures));
+  Settings::Instance().launcher_position.changed.connect(sigc::hide(sigc::mem_fun(this, &OverlayRendererImpl::LoadScaledTextures)));
 
   UpdateTextures();
   LoadScaledTextures();
@@ -126,19 +130,25 @@
 {
   double scale = parent->scale;
   auto& style = dash::Style::Instance();
-  bottom_texture_ = style.GetDashBottomTile(scale);
-  bottom_texture_mask_ = style.GetDashBottomTileMask(scale);
+  dash::DashPosition dash_position;
+  if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM && parent->owner_type() == OverlayOwner::Dash)
+    dash_position = dash::DashPosition::BOTTOM;
+  else
+    dash_position = dash::DashPosition::LEFT;
+
+  horizontal_texture_ = style.GetDashHorizontalTile(scale, dash_position);
+  horizontal_texture_mask_ = style.GetDashHorizontalTileMask(scale, dash_position);
   right_texture_ = style.GetDashRightTile(scale);
   right_texture_mask_ = style.GetDashRightTileMask(scale);
   left_texture_ = style.GetDashLeftTile(scale);
-  top_texture_ = style.GetDashTopTile(scale);
+  top_bottom_texture_ = style.GetDashTopOrBottomTile(scale, dash_position);
 
-  corner_ = style.GetDashCorner(scale);
-  corner_mask_ = style.GetDashCornerMask(scale);
-  left_corner_ = style.GetDashLeftCorner(scale);
-  left_corner_mask_ = style.GetDashLeftCornerMask(scale);
-  top_corner_ = style.GetDashTopCorner(scale);
-  top_corner_mask_ = style.GetDashTopCornerMask(scale);
+  corner_ = style.GetDashCorner(scale, dash_position);
+  corner_mask_ = style.GetDashCornerMask(scale, dash_position);
+  left_corner_ = style.GetDashLeftCorner(scale, dash_position);
+  left_corner_mask_ = style.GetDashLeftCornerMask(scale, dash_position);
+  right_corner_ = style.GetDashRightCorner(scale, dash_position);
+  right_corner_mask_ = style.GetDashRightCornerMask(scale, dash_position);
 }
 
 void OverlayRendererImpl::OnBgColorChanged(nux::Color const& new_color)
@@ -598,7 +608,21 @@
 
   if (Settings::Instance().form_factor() != FormFactor::NETBOOK || force_edges)
   {
-    nux::Geometry geo_border(content_geo.x, content_geo.y, larger_absolute_geo.width - content_geo.x, larger_absolute_geo.height);
+    int monitor = unity::UScreen::GetDefault()->GetMonitorWithMouse();
+    nux::Geometry const& monitor_geo = unity::UScreen::GetDefault()->GetMonitorGeometry(monitor);
+    int launcher_size = Settings::Instance().LauncherSize(monitor);
+    int panel_height = panel::Style::Instance().PanelHeight(monitor);
+
+    dash::DashPosition dash_position = dash::DashPosition::LEFT;
+    int border_y = content_geo.y;
+    int border_height = larger_absolute_geo.height;
+    if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM && !force_edges)
+    {
+      border_y = panel_height;
+      border_height = monitor_geo.height - launcher_size;
+      dash_position = dash::DashPosition::BOTTOM;
+    }
+    nux::Geometry geo_border(content_geo.x, border_y, larger_absolute_geo.width - content_geo.x, border_height);
     gfx_context.PushClippingRectangle(geo_border);
 
     // Paint the edges
@@ -608,8 +632,8 @@
       gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
       nux::TexCoordXForm texxform;
-      auto const& bottom = bottom_texture_;
-      auto const& bottom_mask = bottom_texture_mask_;
+      auto const& horizontal = horizontal_texture_;
+      auto const& horizontal_mask = horizontal_texture_mask_;
       auto const& right = right_texture_;
       auto const& right_mask = right_texture_mask_;
       auto const& corner = corner_;
@@ -617,14 +641,14 @@
       auto const& left_corner = left_corner_;
       auto const& left_corner_mask = left_corner_mask_;
       auto const& left_tile = left_texture_;
-      auto const& top_corner = top_corner_;
-      auto const& top_corner_mask = top_corner_mask_;
-      auto const& top_tile = top_texture_;
+      auto const& right_corner = right_corner_;
+      auto const& right_corner_mask = right_corner_mask_;
+      auto const& top_tile = top_bottom_texture_;
 
       int left_corner_offset = LEFT_CORNER_OFFSET.CP(scale);
       int top_corner_offset = TOP_CORNER_OFFSET.CP(scale);
       nux::Size corner_size(corner->GetWidth(), corner->GetHeight());
-      nux::Size top_corner_size(top_corner->GetWidth(), top_corner->GetHeight());
+      nux::Size right_corner_size(right_corner->GetWidth(), right_corner->GetHeight());
       nux::Size left_corner_size(left_corner->GetWidth(), left_corner->GetHeight());
 
       geo.width += corner_size.width - left_corner_offset;
@@ -633,10 +657,15 @@
         // Corner
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
         texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
+        int corner_y = 0;
+        if (dash_position == dash::DashPosition::BOTTOM)
+          corner_y = geo.y - corner_size.height + top_corner_offset;
+        else
+          corner_y = geo.y + (geo.height - corner_size.height);
 
         // Selectively erase blur region in the curbe
         gfx_context.QRP_ColorModTexAlpha(geo.x + (geo.width - corner_size.width),
-                                         geo.y + (geo.height - corner_size.height),
+                                         corner_y,
                                          corner_size.width,
                                          corner_size.height,
                                          corner_mask->GetDeviceTexture(),
@@ -647,7 +676,7 @@
         gfx_context.GetRenderStates().SetBlend(false);
         gfx_context.GetRenderStates().SetColorMask(false, false, false, true);
         RenderInverseMask(gfx_context, geo.x + (geo.width - corner_size.width),
-                             geo.y + (geo.height - corner_size.height),
+                             corner_y,
                              corner_size.width,
                              corner_size.height,
                              corner_mask->GetDeviceTexture(),
@@ -659,7 +688,7 @@
         gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
 
         gfx_context.QRP_1Tex(geo.x + (geo.width - corner_size.width),
-                             geo.y + (geo.height - corner_size.height),
+                             corner_y,
                              corner_size.width,
                              corner_size.height,
                              corner->GetDeviceTexture(),
@@ -667,19 +696,24 @@
                              nux::color::White);
       }
       {
-        // Bottom repeated texture
+        // Horizontal repeated texture
         int real_width = geo.width - (left_corner_size.width - left_corner_offset) - corner_size.width;
-        int offset = real_width % bottom->GetWidth();
+        int offset = real_width % horizontal->GetWidth();
+        int horizontal_y = 0;
+        if (dash_position == dash::DashPosition::BOTTOM)
+          horizontal_y = geo.y - horizontal->GetHeight() + top_corner_offset;
+        else
+          horizontal_y = geo.y + (geo.height - horizontal->GetHeight());
 
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
         texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
 
         // Selectively erase blur region in the curbe
         gfx_context.QRP_ColorModTexAlpha(left_corner_size.width - left_corner_offset - offset,
-                                         geo.y + (geo.height - bottom->GetHeight()),
+                                         horizontal_y,
                                          real_width + offset,
-                                         bottom->GetHeight(),
-                                         bottom_mask->GetDeviceTexture(),
+                                         horizontal->GetHeight(),
+                                         horizontal_mask->GetDeviceTexture(),
                                          texxform,
                                          nux::color::Black);
 
@@ -687,10 +721,10 @@
         gfx_context.GetRenderStates().SetBlend(false);
         gfx_context.GetRenderStates().SetColorMask(false, false, false, true);
         RenderInverseMask(gfx_context, left_corner_size.width - left_corner_offset - offset,
-                             geo.y + (geo.height - bottom->GetHeight()),
+                             horizontal_y,
                              real_width + offset,
-                             bottom->GetHeight(),
-                             bottom_mask->GetDeviceTexture(),
+                             horizontal->GetHeight(),
+                             horizontal_mask->GetDeviceTexture(),
                              texxform,
                              nux::color::White);
 
@@ -699,44 +733,52 @@
         gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
 
         gfx_context.QRP_1Tex(left_corner_size.width - left_corner_offset - offset,
-                             geo.y + (geo.height - bottom->GetHeight()),
+                             horizontal_y,
                              real_width + offset,
-                             bottom->GetHeight(),
-                             bottom->GetDeviceTexture(),
+                             horizontal->GetHeight(),
+                             horizontal->GetDeviceTexture(),
                              texxform,
                              nux::color::White);
       }
       {
-        // Bottom left corner
+        // Bottom left or top left corner
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
         texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
-
-        // Selectively erase blur region in the curbe
-        gfx_context.QRP_ColorModTexAlpha(geo.x - left_corner_offset,
-                                         geo.y + (geo.height - left_corner_size.height),
-                                         left_corner_size.width,
-                                         left_corner_size.height,
-                                         left_corner_mask->GetDeviceTexture(),
-                                         texxform,
-                                         nux::color::Black);
-
-        // Write correct alpha
-        gfx_context.GetRenderStates().SetBlend(false);
-        gfx_context.GetRenderStates().SetColorMask(false, false, false, true);
-        RenderInverseMask(gfx_context, geo.x - left_corner_offset,
-                             geo.y + (geo.height - left_corner_size.height),
-                             left_corner_size.width,
-                             left_corner_size.height,
-                             left_corner_mask->GetDeviceTexture(),
-                             texxform,
-                             nux::color::White);
+        int left_corner_y = 0;
+        if (dash_position == dash::DashPosition::BOTTOM)
+          left_corner_y = geo.y - left_corner_size.height + top_corner_offset;
+        else
+          left_corner_y = geo.y + (geo.height - left_corner_size.height);
+
+        if (dash_position == dash::DashPosition::LEFT)
+        {
+          // Selectively erase blur region in the curbe
+          gfx_context.QRP_ColorModTexAlpha(geo.x - left_corner_offset,
+                                           left_corner_y,
+                                           left_corner_size.width,
+                                           left_corner_size.height,
+                                           left_corner_mask->GetDeviceTexture(),
+                                           texxform,
+                                           nux::color::Black);
+
+          // Write correct alpha
+          gfx_context.GetRenderStates().SetBlend(false);
+          gfx_context.GetRenderStates().SetColorMask(false, false, false, true);
+          RenderInverseMask(gfx_context, geo.x - left_corner_offset,
+                               left_corner_y,
+                               left_corner_size.width,
+                               left_corner_size.height,
+                               left_corner_mask->GetDeviceTexture(),
+                               texxform,
+                               nux::color::White);
+        }
 
         gfx_context.GetRenderStates().SetBlend(true);
         gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
         gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
 
         gfx_context.QRP_1Tex(geo.x - left_corner_offset,
-                             geo.y + (geo.height - left_corner_size.height),
+                             left_corner_y,
                              left_corner_size.width,
                              left_corner_size.height,
                              left_corner->GetDeviceTexture(),
@@ -748,12 +790,27 @@
         nux::Geometry real_geo = geometry;
         int real_height = real_geo.height - geo.height;
         int offset = real_height % left_tile->GetHeight();
+        int left_texture_y = 0;
+        if (dash_position == dash::DashPosition::BOTTOM)
+        {
+          left_texture_y = panel_height;
+          real_height = monitor_geo.height - launcher_size - content_geo.height - left_corner->GetHeight() - panel_height + top_corner_offset;
+        }
+        else if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+        {
+          left_texture_y = geo.y + geo.height;
+          real_height -= launcher_size;
+        }
+        else
+        {
+          left_texture_y = geo.y + geo.height;
+        }
 
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
         texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
 
         gfx_context.QRP_1Tex(geo.x - left_corner_offset,
-                             geo.y + geo.height,
+                             left_texture_y,
                              left_tile->GetWidth(),
                              real_height + offset,
                              left_tile->GetDeviceTexture(),
@@ -764,12 +821,17 @@
         // Right edge
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
         texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+        int right_edge_y = 0;
+        if (dash_position == dash::DashPosition::BOTTOM)
+          right_edge_y = geo.y + top_corner_offset;
+        else
+          right_edge_y = geo.y + right_corner_size.height - top_corner_offset;
 
         // Selectively erase blur region in the curbe
         gfx_context.QRP_ColorModTexAlpha(geo.x + geo.width - right->GetWidth(),
-                                         geo.y + top_corner_size.height - top_corner_offset,
+                                         right_edge_y,
                                          right->GetWidth(),
-                                         geo.height - corner_size.height - (top_corner_size.height - top_corner_offset),
+                                         geo.height - corner_size.height - (right_corner_size.height - top_corner_offset),
                                          right_mask->GetDeviceTexture(),
                                          texxform,
                                          nux::color::Black);
@@ -778,9 +840,9 @@
         gfx_context.GetRenderStates().SetBlend(false);
         gfx_context.GetRenderStates().SetColorMask(false, false, false, true);
         RenderInverseMask(gfx_context, geo.x + geo.width - right->GetWidth(),
-                             geo.y + top_corner_size.height - top_corner_offset,
+                             right_edge_y,
                              right->GetWidth(),
-                             geo.height - corner_size.height - (top_corner_size.height - top_corner_offset),
+                             geo.height - corner_size.height - (right_corner_size.height - top_corner_offset),
                              right_mask->GetDeviceTexture(),
                              texxform,
                              nux::color::White);
@@ -790,24 +852,29 @@
         gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
 
         gfx_context.QRP_1Tex(geo.x + geo.width - right->GetWidth(),
-                             geo.y + top_corner_size.height - top_corner_offset,
+                             right_edge_y,
                              right->GetWidth(),
-                             geo.height - corner_size.height - (top_corner_size.height - top_corner_offset),
+                             geo.height - corner_size.height - (right_corner_size.height - top_corner_offset),
                              right->GetDeviceTexture(),
                              texxform,
                              nux::color::White);
       }
       {
-        // Top right corner
+        // Top right or bottom right corner
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
         texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
+        int right_corner_y = 0;
+        if (dash_position == dash::DashPosition::BOTTOM)
+          right_corner_y = geo.y + content_geo.height - right_corner_size.height + top_corner_offset;
+        else
+          right_corner_y = geo.y - top_corner_offset;
 
         // Selectively erase blur region in the curbe
         gfx_context.QRP_ColorModTexAlpha(geo.x + geo.width - right->GetWidth(),
-                                        geo.y - top_corner_offset,
-                                        top_corner_size.width,
-                                        top_corner_size.height,
-                                        top_corner_mask->GetDeviceTexture(),
+                                        right_corner_y,
+                                        right_corner_size.width,
+                                        right_corner_size.height,
+                                        right_corner_mask->GetDeviceTexture(),
                                         texxform,
                                         nux::color::Black);
 
@@ -815,10 +882,10 @@
         gfx_context.GetRenderStates().SetBlend(false);
         gfx_context.GetRenderStates().SetColorMask(false, false, false, true);
         RenderInverseMask(gfx_context, geo.x + geo.width - right->GetWidth(),
-                                        geo.y - top_corner_offset,
-                                        top_corner_size.width,
-                                        top_corner_size.height,
-                                        top_corner_mask->GetDeviceTexture(),
+                                        right_corner_y,
+                                        right_corner_size.width,
+                                        right_corner_size.height,
+                                        right_corner_mask->GetDeviceTexture(),
                                         texxform,
                                         nux::color::White);
 
@@ -826,21 +893,26 @@
         gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
         gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
         gfx_context.QRP_1Tex(geo.x + geo.width - right->GetWidth(),
-                             geo.y - top_corner_offset,
-                             top_corner_size.width,
-                             top_corner_size.height,
-                             top_corner->GetDeviceTexture(),
+                             right_corner_y,
+                             right_corner_size.width,
+                             right_corner_size.height,
+                             right_corner->GetDeviceTexture(),
                              texxform,
                              nux::color::White);
       }
       {
-        // Top edge
+        // Top or bottom edge
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
         texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+        int y = 0;
+        if (dash_position == dash::DashPosition::BOTTOM)
+          y = geo.y + content_geo.height - top_tile->GetHeight() + top_corner_offset;
+        else
+          y = geo.y - top_corner_offset;
 
         gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
         gfx_context.QRP_1Tex(geo.x + geo.width,
-                             geo.y - top_corner_offset,
+                             y,
                              geometry.width - (geo.x + geo.width),
                              top_tile->GetHeight(),
                              top_tile->GetDeviceTexture(),
 
=== modified file 'unity-shared/OverlayRenderer.h'
--- unity-shared/OverlayRenderer.h	2014-07-08 13:46:29 +0000
+++ unity-shared/OverlayRenderer.h	2016-03-18 07:01:34 +0000
@@ -29,6 +29,12 @@
 namespace unity 
 {
 
+enum class OverlayOwner
+{
+  Dash = 0,
+  Hud
+};
+
 class OverlayRendererImpl;
 class OverlayRenderer
 {
@@ -40,6 +46,7 @@
   nux::Property<int> x_offset;
   nux::Property<int> y_offset;
   nux::Property<double> scale;
+  nux::Property<OverlayOwner> owner_type;
   
   OverlayRenderer();
   ~OverlayRenderer();
 
=== modified file 'unity-shared/UBusMessages.h'
--- unity-shared/UBusMessages.h	2015-04-15 15:45:22 +0000
+++ unity-shared/UBusMessages.h	2016-03-18 07:01:34 +0000
@@ -41,6 +41,9 @@
 // get rid of keyboard-input-focus
 #define UBUS_LAUNCHER_START_KEY_NAV  "LAUNCHER_START_KEY_NAV"
 #define UBUS_LAUNCHER_END_KEY_NAV    "LAUNCHER_END_KEY_NAV"
+#define UBUS_LAUNCHER_PREV_KEY_NAV   "LAUNCHER_PREV_KEY_NAV"
+#define UBUS_LAUNCHER_NEXT_KEY_NAV   "LAUNCHER_NEXT_KEY_NAV"
+#define UBUS_LAUNCHER_OPEN_QUICKLIST "LAUNCHER_OPEN_QUICKLIST"
 #define UBUS_LAUNCHER_START_KEY_SWITCHER "LAUNCHER_START_KEY_SWITCHER"
 #define UBUS_LAUNCHER_END_KEY_SWITCHER   "LAUNCHER_END_KEY_SWITCHER"
 #define UBUS_LAUNCHER_SELECTION_CHANGED  "LAUNCHER_ICON_SELECTION_CHANGED"