Merge lp:~unity-team/unity/x-sru4 into lp:unity/7.4

[Marco Trevisan (Treviño)]

Releasing SRU4 for Ubuntu 16.04

=== modified file 'dash/FilterExpanderLabel.cpp'
--- dash/FilterExpanderLabel.cpp	2015-05-08 04:24:43 +0000
+++ dash/FilterExpanderLabel.cpp	2016-09-06 23:15:10 +0000
@@ -273,6 +273,14 @@
   graphics_engine.PopClippingRectangle();
 }
 
+nux::Area* FilterExpanderLabel::FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type)
+{
+  if (event_type == nux::EVENT_MOUSE_WHEEL)
+    return nullptr;
+  else
+    return nux::View::FindAreaUnderMouse(mouse_position, event_type);
+}
+
 //
 // Key navigation
 //

=== modified file 'dash/FilterExpanderLabel.h'
--- dash/FilterExpanderLabel.h	2015-05-05 02:03:52 +0000
+++ dash/FilterExpanderLabel.h	2016-09-06 23:15:10 +0000
@@ -69,6 +69,7 @@
   nux::Property<bool> expanded;
 
 protected:
+  nux::Area* FindAreaUnderMouse(const nux::Point&, nux::NuxEventType) override;
   virtual bool AcceptKeyNavFocus();
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'debian/changelog'
--- debian/changelog	2016-08-01 13:10:28 +0000
+++ debian/changelog	2016-09-06 23:15:10 +0000
@@ -1,3 +1,46 @@
+unity (7.4.0+16.04.20160801.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Marco Trevisan (Treviño) ]
+  * SwitcherView: always disable animations when in lowgfx mode (LP:
+    #1602784)
+
+  [ Andrea Azzarone ]
+  * When locked discard damages from windows below lockscreen. (LP:
+    #1605180)
+  * DecoratedWindow: display unmaximize button if the window is
+    vertically or horizontally maximized (LP: #1608480)
+  * Make sure the switcher detail view is properly scaled. Also scale
+    the xy_offset to make sure the switcher and launcher do not overlap.
+    (LP: #1605256)
+  * Close session dialog on first ESC. (LP: #1521116)
+  * Filter out scrolling envents for FilterExpanderLabel. (LP: #1604632)
+  * Disable menu discovery animation if MenusDiscoveryDuration is 0.
+    (LP: #942962)
+  * Redraw fake decorations on window resize. (LP: #940470)
+  * Use compiz::Window::serverNext instead of compiz::Window::next in
+    IsWindowObscured as the latter can be outdated just after
+    scale/spread terminates. (LP: #1614116)
+
+  [ Marco Trevisan (Treviño) ]
+  * DecoratedWindow: avoid deferencing an invalid shadow texture ptr,
+    and split functions (LP: #1608464)
+  * DecoratedWindow: display unmaximize button if the window is
+    vertically or horizontally maximized (LP: #1608480)
+  * DecorationsForceQuitDialog: make CSS selectors work with gtk 3.20
+  * UserAuthenticatorPam: ensure pam_handle_ is null initialized and
+    don't proceed if not set (LP: #1611668)
+  * DecorationStyle: set css name for Gtk 3.20
+  * OverlayRenderer: properly decorate launcher/panel when the launcher
+    is at the bottom (LP: #1611694)
+  * OverlayRenderer: don't use rotated textures, just rotate them at
+    rendering time
+  * SpreadWidgets: add container for spread filter and new spread
+    decorations (LP: #1283314)
+  * WindowButton: properly partially unmaximize a window when
+    middle/left clicking in the restore button (LP: #1616136)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 23 Aug 2016 17:00:35 +0200
+
 unity (7.4.0+16.04.20160801.2-0ubuntu1) xenial; urgency=medium
 
   [ Andrea Azzarone ]

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2016-08-01 13:03:39 +0000
+++ decorations/DecoratedWindow.cpp	2016-09-06 23:15:10 +0000
@@ -148,6 +148,23 @@
   bg_textures_.clear();
 }
 
+void Window::Impl::UpdateWindowState(unsigned old_state)
+{
+  Update();
+
+  if (state_change_button_)
+  {
+    if (win_->state() & (CompWindowStateMaximizedVertMask|CompWindowStateMaximizedHorzMask))
+    {
+      state_change_button_->type = WindowButtonType::UNMAXIMIZE;
+    }
+    else
+    {
+      state_change_button_->type = WindowButtonType::MAXIMIZE;
+    }
+  }
+}
+
 void Window::Impl::UnsetExtents()
 {
   if (win_->hasUnmapReference())
@@ -410,7 +427,13 @@
     top_layout_->Append(std::make_shared<WindowButton>(win_, WindowButtonType::MINIMIZE));
 
   if (win_->actions() & (CompWindowActionMaximizeHorzMask|CompWindowActionMaximizeVertMask))
-    top_layout_->Append(std::make_shared<WindowButton>(win_, WindowButtonType::MAXIMIZE));
+  {
+    auto type = (win_->state() & (CompWindowStateMaximizedVertMask|CompWindowStateMaximizedHorzMask)) ?
+                 WindowButtonType::UNMAXIMIZE : WindowButtonType::MAXIMIZE;
+    auto state_change_button = std::make_shared<WindowButton>(win_, type);
+    top_layout_->Append(state_change_button);
+    state_change_button_ = state_change_button;
+  }
 
   auto title = std::make_shared<Title>();
   title->text = last_title_.empty() ? WindowManager::Default().GetWindowName(win_->id()) : last_title_;
@@ -1003,6 +1026,11 @@
   impl_->Update();
 }
 
+void Window::UpdateWindowState(unsigned old_state)
+{
+  impl_->UpdateWindowState(old_state);
+}
+
 void Window::UpdateFrameRegion(CompRegion& r)
 {
   if (impl_->frame_region_.isEmpty())

=== modified file 'decorations/DecoratedWindow.h'
--- decorations/DecoratedWindow.h	2016-08-01 08:50:22 +0000
+++ decorations/DecoratedWindow.h	2016-09-06 23:15:10 +0000
@@ -53,6 +53,7 @@
   void UpdateDecorationPositionDelayed();
   void UpdateFrameRegion(CompRegion&);
   void UpdateOutputExtents(compiz::window::extents::Extents&);
+  void UpdateWindowState(unsigned old_state);
   void Paint(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&, unsigned mask);
   void Draw(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&, unsigned mask);
 

=== modified file 'decorations/DecorationsForceQuitDialog.cpp'
--- decorations/DecorationsForceQuitDialog.cpp	2016-03-22 15:29:31 +0000
+++ decorations/DecorationsForceQuitDialog.cpp	2016-09-06 23:15:10 +0000
@@ -279,7 +279,7 @@
   int decoration_radius = std::max({radius.top, radius.left, radius.right, radius.bottom});
 
   gtk_css_provider_load_from_data(style, (R"(
-  SheetStyleDialog {
+  SheetStyleDialog, sheet-style-dialog {
     background-color: #f7f6f5;
     color: #4a4a4a;
     border-radius: )"+std::to_string(decoration_radius)+R"(px;
@@ -291,7 +291,7 @@
                            std::to_string(int(color.alpha))+'.'+std::to_string(int(color.alpha*10000.0))+')'+R"(;
   }
 
-  SheetStyleDialog:backdrop {
+  SheetStyleDialog:backdrop, sheet-style-dialog:backdrop {
     background-color: shade(#f7f6f5, 1.2);
     color: shade(#4a4a4a, 1.5);
     border-radius: )"+std::to_string(decoration_radius)+R"(px;
@@ -327,10 +327,7 @@
 
   auto* title = gtk_label_new(_("This window is not responding"));
   glib::Object<GtkCssProvider> title_style(gtk_css_provider_new());
-  gtk_css_provider_load_from_data(title_style, (R"(
-  GtkLabel {
-    font-size: 17px;
-  })"), -1, nullptr);
+  gtk_css_provider_load_from_data(title_style, (R"(* { font-size: 17px; })"), -1, nullptr);
   style_ctx = gtk_widget_get_style_context(title);
   gtk_style_context_add_provider(style_ctx, glib::object_cast<GtkStyleProvider>(title_style), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   gtk_style_context_add_class(style_ctx, "unity-force-quit");
@@ -377,6 +374,10 @@
     gtk_render_background(gtk_widget_get_style_context(self), cr, 0, 0, a.width, a.height);
     return GTK_WIDGET_CLASS(sheet_style_dialog_parent_class)->draw(self, cr);
   };
+
+#if GTK_CHECK_VERSION(3, 20, 0)
+  gtk_widget_class_set_css_name(GTK_WIDGET_CLASS(klass), "sheet-style-dialog");
+#endif
 }
 
 // Close button
@@ -384,7 +385,6 @@
 {
   auto* self = GTK_WIDGET(g_object_new(close_button_get_type(), nullptr));
   gtk_button_set_relief(GTK_BUTTON(self), GTK_RELIEF_NONE);
-  gtk_button_set_focus_on_click(GTK_BUTTON(self), FALSE);
   gtk_widget_set_can_focus(self, FALSE);
   gtk_widget_set_halign(self, GTK_ALIGN_START);
 

=== modified file 'decorations/DecorationsPriv.h'
--- decorations/DecorationsPriv.h	2016-08-01 13:03:39 +0000
+++ decorations/DecorationsPriv.h	2016-09-06 23:15:10 +0000
@@ -49,6 +49,7 @@
 class MenuLayout;
 class SlidingLayout;
 class ForceQuitDialog;
+class WindowButton;
 
 namespace cu = compiz_utils;
 
@@ -103,6 +104,7 @@
   void SetupExtents();
   void ComputeBorderExtent(CompWindowExtents &border);
   void UpdateElements(cu::WindowFilter wf = cu::WindowFilter::NONE);
+  void UpdateWindowState(unsigned old_state);
   void UpdateClientDecorationsState();
   void UpdateMonitor();
   void UpdateFrame();
@@ -166,6 +168,7 @@
   std::shared_ptr<ForceQuitDialog> force_quit_;
   InputMixer::Ptr input_mixer_;
   Layout::Ptr top_layout_;
+  uweak_ptr<WindowButton> state_change_button_;
   uweak_ptr<MenuLayout> menus_;
   uweak_ptr<Title> title_;
   uweak_ptr<SlidingLayout> sliding_layout_;

=== modified file 'decorations/DecorationsWindowButton.cpp'
--- decorations/DecorationsWindowButton.cpp	2014-02-27 07:11:16 +0000
+++ decorations/DecorationsWindowButton.cpp	2016-09-06 23:15:10 +0000
@@ -29,8 +29,8 @@
 namespace decoration
 {
 
-WindowButton::WindowButton(CompWindow* win, WindowButtonType type)
-  : type_(type)
+WindowButton::WindowButton(CompWindow* win, WindowButtonType wbt)
+  : type(wbt)
   , pressed_(false)
   , was_pressed_(false)
   , win_(win)
@@ -39,12 +39,13 @@
   mouse_owner.changed.connect(cb);
   focused.changed.connect(cb);
   scale.changed.connect(cb);
+  type.changed.connect(cb);
   UpdateTexture();
 }
 
 void WindowButton::UpdateTexture()
 {
-  SetTexture(DataPool::Get()->ButtonTexture(scale(), type_, GetCurrentState()));
+  SetTexture(DataPool::Get()->ButtonTexture(scale(), type(), GetCurrentState()));
 }
 
 WidgetState WindowButton::GetCurrentState() const
@@ -98,7 +99,7 @@
     pressed_ = false;
     UpdateTexture();
 
-    switch (type_)
+    switch (type())
     {
       case WindowButtonType::CLOSE:
         if (win_->actions() & CompWindowActionCloseMask)
@@ -112,32 +113,50 @@
         switch (button)
         {
           case Button1:
-            if ((win_->state() & CompWindowStateMaximizedVertMask) ||
-                (win_->state() & CompWindowStateMaximizedHorzMask))
-              win_->maximize(0);
-            else if (win_->actions() & (CompWindowActionMaximizeHorzMask|CompWindowActionMaximizeVertMask))
+            if (win_->actions() & (CompWindowActionMaximizeHorzMask|CompWindowActionMaximizeVertMask))
               win_->maximize(MAXIMIZE_STATE);
             break;
           case Button2:
             if (win_->actions() & CompWindowActionMaximizeVertMask)
             {
               if (!(win_->state() & CompWindowStateMaximizedVertMask))
-                win_->maximize(CompWindowStateMaximizedVertMask);
-              else
-                win_->maximize(0);
+                win_->maximize(win_->state() | CompWindowStateMaximizedVertMask);
             }
             break;
           case Button3:
             if (win_->actions() & CompWindowActionMaximizeHorzMask)
             {
               if (!(win_->state() & CompWindowStateMaximizedHorzMask))
-                win_->maximize(CompWindowStateMaximizedHorzMask);
-              else
-                win_->maximize(0);
+                win_->maximize(win_->state() | CompWindowStateMaximizedHorzMask);
             }
             break;
         }
         break;
+      case WindowButtonType::UNMAXIMIZE:
+        switch (button)
+        {
+          case Button1:
+            win_->maximize(0);
+            break;
+          case Button2:
+            if (win_->actions() & CompWindowActionMaximizeVertMask)
+            {
+              if (!(win_->state() & CompWindowStateMaximizedVertMask))
+                win_->maximize(win_->state() | CompWindowStateMaximizedVertMask);
+              else
+                win_->maximize(win_->state() & ~CompWindowStateMaximizedVertMask);
+            }
+            break;
+          case Button3:
+            if (win_->actions() & CompWindowActionMaximizeHorzMask)
+            {
+              if (!(win_->state() & CompWindowStateMaximizedHorzMask))
+                win_->maximize(win_->state() | CompWindowStateMaximizedHorzMask);
+              else
+                win_->maximize(win_->state() & ~CompWindowStateMaximizedHorzMask);
+            }
+            break;
+        }
       default:
         break;
     }
@@ -168,7 +187,7 @@
 
 std::string WindowButton::GetName() const
 {
-  switch (type_)
+  switch (type())
   {
     case WindowButtonType::CLOSE:
       return "CloseWindowButton";

=== modified file 'decorations/DecorationsWindowButton.h'
--- decorations/DecorationsWindowButton.h	2014-02-19 00:03:24 +0000
+++ decorations/DecorationsWindowButton.h	2016-09-06 23:15:10 +0000
@@ -33,6 +33,8 @@
 public:
   WindowButton(CompWindow*, WindowButtonType type);
 
+  nux::Property<WindowButtonType> type;
+
   WidgetState GetCurrentState() const;
 
 protected:
@@ -46,7 +48,6 @@
 private:
   void UpdateTexture();
 
-  WindowButtonType type_;
   bool pressed_;
   bool was_pressed_;
   CompWindow* win_;

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2016-07-05 10:22:42 +0000
+++ launcher/SwitcherController.cpp	2016-09-06 23:15:10 +0000
@@ -45,7 +45,7 @@
 const std::string DETAIL_TIMEOUT = "detail-timeout";
 const std::string VIEW_CONSTRUCT_IDLE = "view-construct-idle";
 const unsigned FADE_DURATION = 80;
-const int XY_OFFSET = 100;
+const RawPixel XY_OFFSET = 100_em;
 }
 
 namespace switcher
@@ -441,7 +441,8 @@
   int monitor      = uscreen->GetMonitorWithMouse();
   auto monitor_geo = uscreen->GetMonitorGeometry(monitor);
 
-  monitor_geo.Expand(-XY_OFFSET, -XY_OFFSET);
+  auto em = Settings::Instance().em(monitor);
+  monitor_geo.Expand(-XY_OFFSET.CP(em), -XY_OFFSET.CP(em));
 
   return monitor_geo;
 }

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2016-07-05 10:22:42 +0000
+++ launcher/SwitcherView.cpp	2016-09-06 23:15:10 +0000
@@ -49,6 +49,9 @@
   RawPixel const EXTRA_ICON_SPACE = 10_em;
   RawPixel const TEXT_SIZE = 15_em;
 
+  RawPixel const LAYOUT_SPACING = 8_em;
+  RawPixel const LAYOUT_MAX_ROW_HEIGHT = 400_em;
+
   unsigned int const ANIMATION_LENGTH = 250;
   unsigned int const MAX_DIRECTIONS_CHANGED = 3;
   unsigned int const SCROLL_WHEEL_EVENTS_DISTANCE = 75;
@@ -88,6 +91,9 @@
   text_view_->SetFontWeight(PANGO_WEIGHT_BOLD);
   text_view_->SetScale(scale);
 
+  layout_system_.spacing = LAYOUT_SPACING.CP(scale);
+  layout_system_.max_row_height = LAYOUT_MAX_ROW_HEIGHT.CP(scale);
+
   icon_size.changed.connect(sigc::mem_fun(this, &SwitcherView::OnIconSizeChanged));
   tile_size.changed.connect(sigc::mem_fun(this, &SwitcherView::OnTileSizeChanged));
   scale.changed.connect(sigc::mem_fun(this, &SwitcherView::OnScaleChanged));
@@ -211,10 +217,13 @@
   text_size = TEXT_SIZE.CP(scale);
   vertical_size = tile_size + VERTICAL_PADDING.CP(scale) * 2;
   icon_renderer_->scale = scale;
+  layout_system_.spacing = LAYOUT_SPACING.CP(scale);
+  layout_system_.max_row_height = LAYOUT_MAX_ROW_HEIGHT.CP(scale);
 }
 
 void SwitcherView::StartAnimation()
 {
+  animation_.SetDuration(Settings::Instance().low_gfx() ? 0 : animation_length);
   animation::Start(animation_, animation::Direction::FORWARD);
 }
 
@@ -249,7 +258,6 @@
     render_targets_.clear();
   }
 
-  animation_.SetDuration(Settings::Instance().low_gfx() ? 0 : animation_length);
   SaveLast();
 }
 
@@ -260,7 +268,6 @@
 
   delta_tracker_.ResetState();
 
-  animation_.SetDuration(animation_length);
   SaveLast();
 }
 

=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
--- lockscreen/UserAuthenticatorPam.cpp	2016-06-28 16:23:15 +0000
+++ lockscreen/UserAuthenticatorPam.cpp	2016-09-06 23:15:10 +0000
@@ -39,8 +39,9 @@
   first_prompt_ = true;
   username_ = username;
   authenticate_cb_ = authenticate_cb;
+  pam_handle_ = nullptr;
 
-  if (!InitPam())
+  if (!InitPam() || !pam_handle_)
     return false;
 
   glib::Object<GTask> task(g_task_new(nullptr, cancellable_, [] (GObject*, GAsyncResult*, gpointer data) {
@@ -66,7 +67,7 @@
       if (unity::Settings::Instance().pam_check_account_type())
         self->status_ = status2;
 
-      pam_setcred (self->pam_handle_, PAM_REINITIALIZE_CRED);
+      pam_setcred(self->pam_handle_, PAM_REINITIALIZE_CRED);
     }
   });
 

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2015-12-16 15:12:05 +0000
+++ panel/PanelMenuView.cpp	2016-09-06 23:15:10 +0000
@@ -724,7 +724,7 @@
 
     if (new_application_ && !is_inside_)
     {
-      if (opacity() != 1.0f)
+      if (opacity() != 1.0f && menu_manager_->discovery() > 0)
         StartFadeIn(menu_manager_->discovery_fadein());
     }
     else

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2016-07-05 10:22:42 +0000
+++ panel/PanelView.cpp	2016-09-06 23:15:10 +0000
@@ -867,6 +867,9 @@
   menu_view_->SetMonitor(monitor);
   indicators_->SetMonitor(monitor);
   Resize();
+
+  if (WindowManager::Default().IsScaleActive())
+    EnableOverlayMode(true);
 }
 
 void PanelView::Resize()

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-08-01 08:50:22 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-09-06 23:15:10 +0000
@@ -570,8 +570,8 @@
 void UnityScreen::OnInitiateSpread()
 {
   scale_just_activated_ = super_keypressed_;
-  spread_filter_ = std::make_shared<spread::Filter>();
-  spread_filter_->text.changed.connect([this] (std::string const& filter) {
+  spread_widgets_ = std::make_shared<spread::Widgets>();
+  spread_widgets_->GetFilter()->text.changed.connect([this] (std::string const& filter) {
     if (filter.empty())
     {
       sScreen->relayoutSlots(CompMatch::emptyMatch);
@@ -579,7 +579,7 @@
     else
     {
       CompMatch windows_match;
-      auto const& filtered_windows = spread_filter_->FilteredWindows();
+      auto const& filtered_windows = spread_widgets_->GetFilter()->FilteredWindows();
 
       for (auto const& swin : sScreen->getWindows())
       {
@@ -610,7 +610,7 @@
 
 void UnityScreen::OnTerminateSpread()
 {
-  spread_filter_.reset();
+  spread_widgets_.reset();
 
   for (auto const& swin : sScreen->getWindows())
     UnityWindow::get(swin->window)->OnTerminateSpread();
@@ -1745,7 +1745,7 @@
     auto const& geo = NuxGeometryFromCompRect(r);
     wt->PresentWindowsIntersectingGeometryOnThisFrame(geo);
   }
-  
+
   auto const& launchers = launcher_controller_->launchers();
 
   for (auto const& launcher : launchers)
@@ -1857,8 +1857,13 @@
       }
       if (wm.IsScaleActive())
       {
-        if (spread_filter_ && spread_filter_->Visible())
-          skip_other_plugins = spread_filter_->GetAbsoluteGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root);
+        if (spread_widgets_)
+        {
+          auto const& spread_filter = spread_widgets_->GetFilter();
+
+          if (spread_filter && spread_filter->Visible())
+            skip_other_plugins = spread_filter->GetAbsoluteGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root);
+        }
 
         if (!skip_other_plugins)
         {
@@ -1941,8 +1946,13 @@
       }
       else if (wm.IsScaleActive())
       {
-        if (spread_filter_ && spread_filter_->Visible())
-          skip_other_plugins = spread_filter_->GetAbsoluteGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root);
+        if (spread_widgets_)
+        {
+          auto const& spread_filter = spread_widgets_->GetFilter();
+
+          if (spread_filter && spread_filter->Visible())
+            skip_other_plugins = spread_filter->GetAbsoluteGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root);
+        }
 
         if (!skip_other_plugins)
         {
@@ -2018,12 +2028,12 @@
         }
       }
 
-      if (spread_filter_ && spread_filter_->Visible())
+      if (spread_widgets_ && spread_widgets_->GetFilter()->Visible())
       {
         if (key_sym == XK_Escape)
         {
           skip_other_plugins = true;
-          spread_filter_->text = "";
+          spread_widgets_->GetFilter()->text = "";
         }
       }
 
@@ -2072,7 +2082,7 @@
     skip_other_plugins = true;
   }
 
-  if (spread_filter_ && spread_filter_->Visible())
+  if (spread_widgets_ && spread_widgets_->GetFilter() && spread_widgets_->GetFilter()->Visible())
     skip_other_plugins = false;
 
   if (!skip_other_plugins &&
@@ -3189,6 +3199,9 @@
 
 bool UnityWindow::damageRect(bool initial, CompRect const& rect)
 {
+  if (uScreen->lockscreen_controller_->IsLocked() && !CanBypassLockScreen())
+    return true;
+
   if (initial)
     deco_win_->Update();
 
@@ -3418,7 +3431,7 @@
     uScreen->fullscreen_windows_.remove(window);
   }
 
-  deco_win_->Update();
+  deco_win_->UpdateWindowState(lastState);
   PluginAdapter::Default().NotifyStateChange(window, window->state(), lastState);
   window->stateChangeNotify(lastState);
 }
@@ -3460,6 +3473,7 @@
 void UnityWindow::resizeNotify(int x, int y, int w, int h)
 {
   deco_win_->UpdateDecorationPositionDelayed();
+  CleanupCachedTextures();
   PluginAdapter::Default().NotifyResized(window, x, y, w, h);
   window->resizeNotify(x, y, w, h);
 }
@@ -4774,7 +4788,7 @@
 
 Introspectable::IntrospectableList ScreenIntrospection::GetIntrospectableChildren()
 {
-  IntrospectableList children({uScreen->spread_filter_.get()});
+  IntrospectableList children({uScreen->spread_widgets_ ? uScreen->spread_widgets_->GetFilter().get() : nullptr});
 
   for (auto const& win : screen_->windows())
     children.push_back(UnityWindow::get(win));

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2016-06-06 14:28:29 +0000
+++ plugins/unityshell/src/unityshell.h	2016-09-06 23:15:10 +0000
@@ -69,7 +69,7 @@
 #include "SwitcherController.h"
 #include "SessionController.h"
 #include "SessionDBusManager.h"
-#include "SpreadFilter.h"
+#include "SpreadWidgets.h"
 #include "UBusWrapper.h"
 #include "UnityshellPrivate.h"
 #include "UnityShowdesktopHandler.h"
@@ -340,7 +340,7 @@
   ui::EdgeBarrierController::Ptr edge_barriers_;
   debug::DebugDBusInterface debugger_;
   std::unique_ptr<BGHash>   bghash_;
-  spread::Filter::Ptr       spread_filter_;
+  spread::Widgets::Ptr      spread_widgets_;
 
   /* Subscription for gestures that manipulate Unity launcher */
   std::unique_ptr<nux::GesturesSubscription> gestures_sub_launcher_;

=== removed file 'resources/dash_bottom_right_corner_rotated.png'
Binary files resources/dash_bottom_right_corner_rotated.png	2016-02-02 07:25:02 +0000 and resources/dash_bottom_right_corner_rotated.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/dash_bottom_right_corner_rotated_mask.png'
Binary files resources/dash_bottom_right_corner_rotated_mask.png	2016-02-14 11:26:30 +0000 and resources/dash_bottom_right_corner_rotated_mask.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/dash_bottom_tile.png'
Binary files resources/dash_bottom_tile.png	2016-02-14 11:26:30 +0000 and resources/dash_bottom_tile.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/dash_top_border_tile.png'
Binary files resources/dash_top_border_tile.png	2016-02-14 11:26:30 +0000 and resources/dash_top_border_tile.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/dash_top_border_tile_mask.png'
Binary files resources/dash_top_border_tile_mask.png	2016-02-14 11:26:30 +0000 and resources/dash_top_border_tile_mask.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/dash_top_left_corner.png'
Binary files resources/dash_top_left_corner.png	2016-02-14 11:26:30 +0000 and resources/dash_top_left_corner.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/dash_top_left_corner_mask.png'
Binary files resources/dash_top_left_corner_mask.png	2016-02-14 11:26:30 +0000 and resources/dash_top_left_corner_mask.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/dash_top_right_corner_rotated.png'
Binary files resources/dash_top_right_corner_rotated.png	2016-02-02 07:25:02 +0000 and resources/dash_top_right_corner_rotated.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/dash_top_right_corner_rotated_mask.png'
Binary files resources/dash_top_right_corner_rotated_mask.png	2016-02-14 11:26:30 +0000 and resources/dash_top_right_corner_rotated_mask.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/overlay_top_left_tile.png'
Binary files resources/overlay_top_left_tile.png	1970-01-01 00:00:00 +0000 and resources/overlay_top_left_tile.png	2016-09-06 23:15:10 +0000 differ
=== modified file 'shutdown/SessionView.cpp'
--- shutdown/SessionView.cpp	2015-07-01 01:38:02 +0000
+++ shutdown/SessionView.cpp	2016-09-06 23:15:10 +0000
@@ -356,14 +356,6 @@
       }
     }
   }
-  else if (key_code == NUX_VK_ESCAPE)
-  {
-    nux::InputArea* focused = nux::GetWindowCompositor().GetKeyFocusArea();
-
-    // Let's reset the focused area if we're in keyboard-navigation mode.
-    if (focused && focused->IsChildOf(buttons_layout_) && !focused->IsMouseInside())
-      return this;
-  }
 
   return UnityWindowView::FindKeyFocusArea(etype, key_code, modifiers);
 }

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2016-02-25 15:59:41 +0000
+++ unity-shared/CMakeLists.txt	2016-09-06 23:15:10 +0000
@@ -58,6 +58,7 @@
      SearchBar.cpp
      SearchBarSpinner.cpp
      SpreadFilter.cpp
+     SpreadWidgets.cpp
      StaticCairoText.cpp
      TextureCache.cpp
      TextInput.cpp

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2016-06-28 16:23:27 +0000
+++ unity-shared/DashStyle.cpp	2016-09-06 23:15:10 +0000
@@ -2121,24 +2121,14 @@
   return true;
 }
 
-BaseTexturePtr Style::GetDashHorizontalTile(double scale, Position dash_position) const
+BaseTexturePtr Style::GetDashHorizontalTile(double scale) const
 {
-  std::string horizontal_tile;
-  if (dash_position == Position::BOTTOM)
-    horizontal_tile = "dash_top_border_tile";
-  else
-    horizontal_tile = "dash_bottom_border_tile";
-  return pimpl->LoadScaledTexture(horizontal_tile, scale);
+  return pimpl->LoadScaledTexture("dash_bottom_border_tile", scale);
 }
 
-BaseTexturePtr Style::GetDashHorizontalTileMask(double scale, Position dash_position) const
+BaseTexturePtr Style::GetDashHorizontalTileMask(double scale) const
 {
-  std::string horizontal_tile_mask;
-  if (dash_position == Position::BOTTOM)
-    horizontal_tile_mask = "dash_top_border_tile_mask";
-  else
-    horizontal_tile_mask = "dash_bottom_border_tile_mask";
-  return pimpl->LoadScaledTexture(horizontal_tile_mask, scale);
+  return pimpl->LoadScaledTexture("dash_bottom_border_tile_mask", scale);
 }
 
 BaseTexturePtr Style::GetDashRightTile(double scale) const
@@ -2151,79 +2141,49 @@
   return pimpl->LoadScaledTexture("dash_right_border_tile_mask", scale);
 }
 
+BaseTexturePtr Style::GetDashTopLeftTile(double scale) const
+{
+  return pimpl->LoadScaledTexture("overlay_top_left_tile", scale);
+}
+
 BaseTexturePtr Style::GetDashLeftTile(double scale) const
 {
   return pimpl->LoadScaledTexture("dash_left_tile", scale);
 }
 
-BaseTexturePtr Style::GetDashTopOrBottomTile(double scale, Position dash_position) const
-{
-  std::string top_bottom_tile;
-  if (dash_position == Position::BOTTOM)
-    top_bottom_tile = "dash_bottom_tile";
-  else
-    top_bottom_tile = "dash_top_tile";
-  return pimpl->LoadScaledTexture(top_bottom_tile, scale);
-}
-
-BaseTexturePtr Style::GetDashCorner(double scale, Position dash_position) const
-{
-  std::string corner;
-  if (dash_position == Position::BOTTOM)
-    corner = "dash_top_right_corner_rotated";
-  else
-    corner = "dash_bottom_right_corner";
-  return pimpl->LoadScaledTexture(corner, scale);
-}
-
-BaseTexturePtr Style::GetDashCornerMask(double scale, Position dash_position) const
-{
-  std::string corner_mask;
-  if (dash_position == Position::BOTTOM)
-    corner_mask = "dash_top_right_corner_rotated_mask";
-  else
-    corner_mask = "dash_bottom_right_corner_mask";
-  return pimpl->LoadScaledTexture(corner_mask, scale);
-}
-
-BaseTexturePtr Style::GetDashLeftCorner(double scale, Position dash_position) const
-{
-  std::string left_corner;
-  if (dash_position == Position::BOTTOM)
-    left_corner = "dash_top_left_corner";
-  else
-    left_corner = "dash_bottom_left_corner";
-  return pimpl->LoadScaledTexture(left_corner, scale);
-}
-
-BaseTexturePtr Style::GetDashLeftCornerMask(double scale, Position dash_position) const
-{
-  std::string left_corner_mask;
-  if (dash_position == Position::BOTTOM)
-    left_corner_mask = "dash_top_left_corner_mask";
-  else
-    left_corner_mask = "dash_bottom_left_corner_mask";
-  return pimpl->LoadScaledTexture(left_corner_mask, scale);
-}
-
-BaseTexturePtr Style::GetDashRightCorner(double scale, Position dash_position) const
-{
-  std::string right_corner;
-  if (dash_position == Position::BOTTOM)
-    right_corner = "dash_bottom_right_corner_rotated";
-  else
-    right_corner = "dash_top_right_corner";
-  return pimpl->LoadScaledTexture(right_corner, scale);
-}
-
-BaseTexturePtr Style::GetDashRightCornerMask(double scale, Position dash_position) const
-{
-  std::string right_corner_mask;
-  if (dash_position == Position::BOTTOM)
-    right_corner_mask = "dash_bottom_right_corner_rotated_mask";
-  else
-    right_corner_mask = "dash_top_right_corner_mask";
-  return pimpl->LoadScaledTexture(right_corner_mask, scale);
+BaseTexturePtr Style::GetDashTopTile(double scale) const
+{
+  return pimpl->LoadScaledTexture("dash_top_tile", scale);
+}
+
+BaseTexturePtr Style::GetDashCorner(double scale) const
+{
+  return pimpl->LoadScaledTexture("dash_bottom_right_corner", scale);
+}
+
+BaseTexturePtr Style::GetDashCornerMask(double scale) const
+{
+  return pimpl->LoadScaledTexture("dash_bottom_right_corner_mask", scale);
+}
+
+BaseTexturePtr Style::GetDashLeftCorner(double scale) const
+{
+  return pimpl->LoadScaledTexture("dash_bottom_left_corner", scale);
+}
+
+BaseTexturePtr Style::GetDashLeftCornerMask(double scale) const
+{
+  return pimpl->LoadScaledTexture("dash_bottom_left_corner_mask", scale);
+}
+
+BaseTexturePtr Style::GetDashRightCorner(double scale) const
+{
+  return pimpl->LoadScaledTexture("dash_top_right_corner", scale);
+}
+
+BaseTexturePtr Style::GetDashRightCornerMask(double scale) const
+{
+  return pimpl->LoadScaledTexture("dash_top_right_corner_mask", scale);
 }
 
 BaseTexturePtr Style::GetSearchMagnifyIcon(double scale) const

=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2016-06-28 16:23:27 +0000
+++ unity-shared/DashStyle.h	2016-09-06 23:15:10 +0000
@@ -85,11 +85,6 @@
   NONE
 };
 
-enum class Position {
-  LEFT,
-  BOTTOM
-};
-
 class Style : public StyleInterface
 {
 public:
@@ -175,19 +170,20 @@
   BaseTexturePtr const& GetCategoryBackground() const;
   BaseTexturePtr const& GetCategoryBackgroundNoFilters() const;
 
-  BaseTexturePtr GetDashHorizontalTile(double scale, Position) const;
-  BaseTexturePtr GetDashHorizontalTileMask(double scale, Position) const;
+  BaseTexturePtr GetDashHorizontalTile(double scale) const;
+  BaseTexturePtr GetDashHorizontalTileMask(double scale) const;
   BaseTexturePtr GetDashRightTile(double scale) const;
   BaseTexturePtr GetDashRightTileMask(double scale) const;
+  BaseTexturePtr GetDashTopLeftTile(double scale) const;
   BaseTexturePtr GetDashLeftTile(double scale) const;
-  BaseTexturePtr GetDashTopOrBottomTile(double scale, Position) const;
+  BaseTexturePtr GetDashTopTile(double scale) const;
 
-  BaseTexturePtr GetDashCorner(double scale, Position) const;
-  BaseTexturePtr GetDashCornerMask(double scale, Position) const;
-  BaseTexturePtr GetDashLeftCorner(double scale, Position) const;
-  BaseTexturePtr GetDashLeftCornerMask(double scale, Position) const;
-  BaseTexturePtr GetDashRightCorner(double scale, Position) const;
-  BaseTexturePtr GetDashRightCornerMask(double scale, Position) const;
+  BaseTexturePtr GetDashCorner(double scale) const;
+  BaseTexturePtr GetDashCornerMask(double scale) const;
+  BaseTexturePtr GetDashLeftCorner(double scale) const;
+  BaseTexturePtr GetDashLeftCornerMask(double scale) const;
+  BaseTexturePtr GetDashRightCorner(double scale) const;
+  BaseTexturePtr GetDashRightCornerMask(double scale) const;
 
   RawPixel GetDashHorizontalBorderHeight() const;
   RawPixel GetDashVerticalBorderWidth() const;

=== modified file 'unity-shared/DecorationStyle.cpp'
--- unity-shared/DecorationStyle.cpp	2016-05-17 02:55:35 +0000
+++ unity-shared/DecorationStyle.cpp	2016-09-06 23:15:10 +0000
@@ -124,6 +124,10 @@
 
   param = g_param_spec_boxed("glow-color", "Selected Window Glow Color", "", GDK_TYPE_RGBA, G_PARAM_READABLE);
   gtk_widget_class_install_style_property(GTK_WIDGET_CLASS(klass), param);
+
+#if GTK_CHECK_VERSION(3, 20, 0)
+  gtk_widget_class_set_css_name(GTK_WIDGET_CLASS(klass), "UnityDecoration");
+#endif
 }
 
 Border BorderFromGtkBorder(GtkBorder* b, Border const& fallback = Border())
@@ -369,6 +373,7 @@
   void AddContextClasses(Side s, WidgetState ws, GtkStyleContext* ctx = nullptr)
   {
     ctx = ctx ? ctx : ctx_;
+    gtk_style_context_add_class(ctx, "unity-decoration");
     gtk_style_context_add_class(ctx, "background");
     gtk_style_context_add_class(ctx, "gnome-panel-menu-bar");
     if (s == Side::TOP) { gtk_style_context_add_class(ctx, "header-bar"); }
@@ -804,4 +809,4 @@
 }
 
 } // decoration namespace
-} // unity namespace
\ No newline at end of file
+} // unity namespace

=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2016-07-05 10:22:42 +0000
+++ unity-shared/OverlayRenderer.cpp	2016-09-06 23:15:10 +0000
@@ -50,6 +50,12 @@
 // Now that we mask the corners of the dash,
 // draw longer lines to fill the minimal gaps
 const RawPixel CORNER_OVERLAP = 3_em;
+
+enum class OverlayPosition
+{
+  LEFT,
+  BOTTOM
+};
 }
 
 // Impl class
@@ -82,7 +88,9 @@
   nux::ObjectPtr<nux::BaseTexture> right_texture_;
   nux::ObjectPtr<nux::BaseTexture> right_texture_mask_;
   nux::ObjectPtr<nux::BaseTexture> left_texture_;
-  nux::ObjectPtr<nux::BaseTexture> top_bottom_texture_;
+  nux::ObjectPtr<nux::BaseTexture> top_left_texture_;
+  nux::ObjectPtr<nux::BaseTexture> top_texture_;
+  nux::ObjectPtr<nux::BaseTexture> bottom_texture_;
 
   nux::ObjectPtr<nux::BaseTexture> corner_;
   nux::ObjectPtr<nux::BaseTexture> corner_mask_;
@@ -120,7 +128,6 @@
   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::hide(sigc::mem_fun(this, &OverlayRendererImpl::UpdateTextures)));
-  Settings::Instance().launcher_position.changed.connect(sigc::hide(sigc::mem_fun(this, &OverlayRendererImpl::LoadScaledTextures)));
   dash::Style::Instance().textures_changed.connect(sigc::mem_fun(this, &OverlayRendererImpl::UpdateTextures));
   dash::Style::Instance().textures_changed.connect(sigc::mem_fun(this, &OverlayRendererImpl::LoadScaledTextures));
 
@@ -132,24 +139,21 @@
 {
   double scale = parent->scale;
   auto& style = dash::Style::Instance();
-  auto dash_position = dash::Position::LEFT;
-
-  if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM && parent->owner_type() == OverlayOwner::Dash)
-    dash_position = dash::Position::BOTTOM;
-
-  horizontal_texture_ = style.GetDashHorizontalTile(scale, dash_position);
-  horizontal_texture_mask_ = style.GetDashHorizontalTileMask(scale, dash_position);
+
+  horizontal_texture_ = style.GetDashHorizontalTile(scale);
+  horizontal_texture_mask_ = style.GetDashHorizontalTileMask(scale);
   right_texture_ = style.GetDashRightTile(scale);
   right_texture_mask_ = style.GetDashRightTileMask(scale);
+  top_left_texture_ = style.GetDashTopLeftTile(scale);
   left_texture_ = style.GetDashLeftTile(scale);
-  top_bottom_texture_ = style.GetDashTopOrBottomTile(scale, dash_position);
+  top_texture_ = style.GetDashTopTile(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);
+  corner_ = style.GetDashCorner(scale);
+  corner_mask_ = style.GetDashCornerMask(scale);
+  left_corner_ = style.GetDashLeftCorner(scale);
+  left_corner_mask_ = style.GetDashLeftCornerMask(scale);
+  right_corner_ = style.GetDashRightCorner(scale);
+  right_corner_mask_ = style.GetDashRightCornerMask(scale);
 }
 
 void OverlayRendererImpl::OnBgColorChanged(nux::Color const& new_color)
@@ -610,19 +614,19 @@
 
   if (settings.form_factor() != FormFactor::NETBOOK || force_edges)
   {
-    int monitor = unity::UScreen::GetDefault()->GetMonitorWithMouse();
-    nux::Geometry const& monitor_geo = unity::UScreen::GetDefault()->GetMonitorGeometry(monitor);
+    int monitor = UScreen::GetDefault()->GetMonitorAtPosition(absolute_geo.x, absolute_geo.y);
+    auto const& monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
     int launcher_size = Settings::Instance().LauncherSize(monitor);
     int panel_height = panel::Style::Instance().PanelHeight(monitor);
 
-    auto dash_position = dash::Position::LEFT;
+    auto dash_position = OverlayPosition::LEFT;
     int border_y = content_geo.y;
     int border_height = larger_absolute_geo.height;
     if (parent->owner_type() == OverlayOwner::Dash && settings.launcher_position() == LauncherPosition::BOTTOM)
     {
       border_y = panel_height;
       border_height = monitor_geo.height - launcher_size;
-      dash_position = dash::Position::BOTTOM;
+      dash_position = OverlayPosition::BOTTOM;
     }
 
     nux::Geometry geo_border(content_geo.x, border_y, larger_absolute_geo.width - content_geo.x, border_height);
@@ -646,7 +650,13 @@
       auto const& left_tile = left_texture_;
       auto const& right_corner = right_corner_;
       auto const& right_corner_mask = right_corner_mask_;
-      auto const& top_tile = top_bottom_texture_;
+      auto const& horizontal_tile = top_texture_;
+
+      if (dash_position == OverlayPosition::BOTTOM)
+      {
+        // Let's flip all the textures vertically
+        texxform.flip_v_coord = true;
+      }
 
       int left_corner_offset = LEFT_CORNER_OFFSET.CP(scale);
       int top_corner_offset = TOP_CORNER_OFFSET.CP(scale);
@@ -662,7 +672,7 @@
         texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
         int corner_y = geo.y + (geo.height - corner_size.height);
 
-        if (dash_position == dash::Position::BOTTOM)
+        if (dash_position == OverlayPosition::BOTTOM)
           corner_y = geo.y - corner_size.height + top_corner_offset;
 
         // Selectively erase blur region in the curbe
@@ -700,19 +710,18 @@
       {
         // Horizontal repeated texture
         int real_width = geo.width - (left_corner_size.width - left_corner_offset) - corner_size.width;
-        int offset = real_width % horizontal->GetWidth();
         int horizontal_y = geo.y + (geo.height - horizontal->GetHeight());
 
-        if (dash_position == dash::Position::BOTTOM)
+        if (dash_position == OverlayPosition::BOTTOM)
           horizontal_y = geo.y - horizontal->GetHeight() + top_corner_offset;
 
         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,
+        gfx_context.QRP_ColorModTexAlpha(left_corner_size.width - left_corner_offset,
                                          horizontal_y,
-                                         real_width + offset,
+                                         real_width,
                                          horizontal->GetHeight(),
                                          horizontal_mask->GetDeviceTexture(),
                                          texxform,
@@ -721,9 +730,9 @@
         // Write correct alpha
         gfx_context.GetRenderStates().SetBlend(false);
         gfx_context.GetRenderStates().SetColorMask(false, false, false, true);
-        RenderInverseMask(gfx_context, left_corner_size.width - left_corner_offset - offset,
+        RenderInverseMask(gfx_context, left_corner_size.width - left_corner_offset,
                              horizontal_y,
-                             real_width + offset,
+                             real_width,
                              horizontal->GetHeight(),
                              horizontal_mask->GetDeviceTexture(),
                              texxform,
@@ -733,9 +742,9 @@
         gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
         gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
 
-        gfx_context.QRP_1Tex(left_corner_size.width - left_corner_offset - offset,
+        gfx_context.QRP_1Tex(left_corner_size.width - left_corner_offset,
                              horizontal_y,
-                             real_width + offset,
+                             real_width,
                              horizontal->GetHeight(),
                              horizontal->GetDeviceTexture(),
                              texxform,
@@ -747,10 +756,10 @@
         texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
         int left_corner_y = geo.y + (geo.height - left_corner_size.height);
 
-        if (dash_position == dash::Position::BOTTOM)
+        if (dash_position == OverlayPosition::BOTTOM)
           left_corner_y = geo.y - left_corner_size.height + top_corner_offset;
 
-        if (dash_position == dash::Position::LEFT)
+        if (dash_position == OverlayPosition::LEFT)
         {
           // Selectively erase blur region in the curbe
           gfx_context.QRP_ColorModTexAlpha(geo.x - left_corner_offset,
@@ -792,14 +801,14 @@
         int offset = real_height % left_tile->GetHeight();
         int left_texture_y = geo.y + geo.height;
 
-        if (dash_position == dash::Position::BOTTOM)
+        if (dash_position == OverlayPosition::BOTTOM)
         {
-          left_texture_y = panel_height;
-          real_height = monitor_geo.height - launcher_size - content_geo.height - left_corner->GetHeight() - panel_height + top_corner_offset;
+          left_texture_y = panel_height + top_left_texture_->GetHeight();
+          real_height = monitor_geo.height - launcher_size - content_geo.height - left_corner->GetHeight() - panel_height + top_corner_offset - top_left_texture_->GetHeight();
         }
         else if (settings.launcher_position() == LauncherPosition::BOTTOM)
         {
-          real_height -= launcher_size;
+          real_height -= launcher_size + top_left_texture_->GetWidth();
         }
 
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
@@ -819,7 +828,7 @@
         texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
         int right_edge_y = geo.y + right_corner_size.height - top_corner_offset;
 
-        if (dash_position == dash::Position::BOTTOM)
+        if (dash_position == OverlayPosition::BOTTOM)
           right_edge_y = geo.y + top_corner_offset;
 
         // Selectively erase blur region in the curbe
@@ -860,7 +869,7 @@
         texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
         int right_corner_y = geo.y - top_corner_offset;
 
-        if (dash_position == dash::Position::BOTTOM)
+        if (dash_position == OverlayPosition::BOTTOM)
           right_corner_y = geo.y + content_geo.height - right_corner_size.height + top_corner_offset;
 
         // Selectively erase blur region in the curbe
@@ -900,17 +909,79 @@
         texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
         int y = geo.y - top_corner_offset;
 
-        if (dash_position == dash::Position::BOTTOM)
-          y = geo.y + content_geo.height - top_tile->GetHeight() + top_corner_offset;
+        if (dash_position == OverlayPosition::BOTTOM)
+          y = geo.y + content_geo.height - horizontal_tile->GetHeight() + top_corner_offset;
 
         gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
         gfx_context.QRP_1Tex(geo.x + geo.width,
                              y,
                              geometry.width - (geo.x + geo.width),
-                             top_tile->GetHeight(),
-                             top_tile->GetDeviceTexture(),
+                             horizontal_tile->GetHeight(),
+                             horizontal_tile->GetDeviceTexture(),
                              texxform,
                              nux::color::White);
+
+        if (dash_position == OverlayPosition::BOTTOM)
+        {
+          // Top Left edge
+          nux::TexCoordXForm top_texxform;
+          top_texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+          top_texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
+
+          gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
+          gfx_context.QRP_1Tex(0,
+                               panel_height,
+                               top_left_texture_->GetWidth(),
+                               top_left_texture_->GetHeight(),
+                               top_left_texture_->GetDeviceTexture(),
+                               top_texxform,
+                               nux::color::White);
+          // Top edge
+          top_texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+          top_texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+          gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
+          gfx_context.QRP_1Tex(top_left_texture_->GetWidth(),
+                               panel_height - top_corner_offset,
+                               monitor_geo.width - top_left_texture_->GetWidth(),
+                               horizontal_tile->GetHeight(),
+                               horizontal_tile->GetDeviceTexture(),
+                               top_texxform,
+                               nux::color::White);
+        }
+        else if (settings.launcher_position() == LauncherPosition::BOTTOM)
+        {
+          int above_launcher_y = monitor_geo.height - panel_height - launcher_size;
+          bool was_flipped = texxform.flip_v_coord;
+
+          // Bottom Left edge
+          texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+          texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
+          texxform.flip_v_coord = true;
+
+          gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
+          gfx_context.QRP_1Tex(0,
+                               above_launcher_y - top_left_texture_->GetWidth(),
+                               top_left_texture_->GetWidth(),
+                               top_left_texture_->GetHeight(),
+                               top_left_texture_->GetDeviceTexture(),
+                               texxform,
+                               nux::color::White);
+
+          // Bottom edge
+          texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+          texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+
+          gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
+          gfx_context.QRP_1Tex(top_left_texture_->GetHeight(),
+                               above_launcher_y + top_corner_offset - horizontal_tile->GetHeight(),
+                               monitor_geo.width - top_left_texture_->GetHeight(),
+                               horizontal_tile->GetHeight(),
+                               horizontal_tile->GetDeviceTexture(),
+                               texxform,
+                               nux::color::White);
+
+          texxform.flip_v_coord = was_flipped;
+        }
       }
     }
 

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2016-07-14 10:04:31 +0000
+++ unity-shared/PluginAdapter.cpp	2016-09-06 23:15:10 +0000
@@ -608,7 +608,7 @@
 
     CompPoint window_vp = window->defaultViewport();
     // Check if any windows above this one are blocking it
-    for (CompWindow* sibling = window->next; sibling != NULL; sibling = sibling->next)
+    for (CompWindow* sibling = window->serverNext; sibling != NULL; sibling = sibling->serverNext)
     {
       if (sibling->defaultViewport() == window_vp
           && !sibling->minimized()

=== added file 'unity-shared/SpreadWidgets.cpp'
--- unity-shared/SpreadWidgets.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/SpreadWidgets.cpp	2016-09-06 23:15:10 +0000
@@ -0,0 +1,195 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2016 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Authored by: Marco Trevisan <[e-mail]>
+*/
+
+#include "SpreadWidgets.h"
+
+#include "DashStyle.h"
+#include "PanelStyle.h"
+#include "RawPixel.h"
+#include "SearchBar.h"
+#include "UnitySettings.h"
+#include "UScreen.h"
+
+namespace unity
+{
+namespace spread
+{
+namespace
+{
+const RawPixel LEFT_CORNER_OFFSET = 10_em;
+}
+
+class Decorations : public nux::BaseWindow
+{
+public:
+  nux::Property<int> monitor;
+
+  Decorations(int monitor_)
+    : monitor(monitor_)
+  {
+    monitor.changed.connect(sigc::mem_fun(this, &Decorations::Update));
+    SetBackgroundColor(nux::color::Transparent);
+
+    Update(monitor);
+    PushToFront();
+    ShowWindow(true);
+  }
+
+  ~Decorations()
+  {
+    ShowWindow(false);
+    object_destroyed.emit(this);
+  }
+
+  void Update(int monitor)
+  {
+    auto& settings = Settings::Instance();
+    auto abs_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
+    int panel_height = panel::Style::Instance().PanelHeight(monitor);
+    int launcher_size = settings.LauncherSize(monitor);
+    scale_ = settings.em(monitor)->DPIScale();
+
+    if (settings.launcher_position() == LauncherPosition::LEFT)
+    {
+      abs_geo.x += launcher_size;
+      abs_geo.width -= launcher_size;
+    }
+    else
+    {
+      abs_geo.height -= launcher_size;
+    }
+
+    abs_geo.y += panel_height;
+    abs_geo.height -= panel_height;
+    SetGeometry(abs_geo);
+
+    auto& dash_style = dash::Style::Instance();
+    corner_tex_ = dash_style.GetDashTopLeftTile(scale_);
+    left_edge_tex_ = dash_style.GetDashLeftTile(scale_);
+    horizontal_tex_ = dash_style.GetDashTopTile(scale_);
+  }
+
+  void DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw) override
+  {
+    auto const& geo = GetGeometry();
+    auto launcher_position = Settings::Instance().launcher_position();
+    int x_offset = 0;
+
+    nux::TexCoordXForm texxform;
+
+    if (launcher_position == LauncherPosition::LEFT)
+    {
+      // Corner
+      texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+      texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
+
+      gfx_context.QRP_1Tex(0,
+                           0,
+                           corner_tex_->GetWidth(),
+                           corner_tex_->GetHeight(),
+                           corner_tex_->GetDeviceTexture(),
+                           texxform,
+                           nux::color::White);
+
+      x_offset = corner_tex_->GetWidth();
+    }
+
+    // Top Edge
+    texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+    texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+
+    gfx_context.QRP_1Tex(x_offset,
+                         -LEFT_CORNER_OFFSET.CP(scale_),
+                         geo.width - x_offset,
+                         horizontal_tex_->GetHeight(),
+                         horizontal_tex_->GetDeviceTexture(),
+                         texxform,
+                         nux::color::White);
+
+    if (launcher_position == LauncherPosition::LEFT)
+    {
+      // Left edge
+      texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+      texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+
+      gfx_context.QRP_1Tex(-LEFT_CORNER_OFFSET.CP(scale_),
+                           corner_tex_->GetHeight(),
+                           left_edge_tex_->GetWidth(),
+                           geo.height,
+                           left_edge_tex_->GetDeviceTexture(),
+                           texxform,
+                           nux::color::White);
+    }
+    else if (launcher_position == LauncherPosition::BOTTOM)
+    {
+      texxform.flip_v_coord = true;
+
+      // Bottom Edge
+      texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+      texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+
+      gfx_context.QRP_1Tex(0,
+                           geo.height - horizontal_tex_->GetHeight() + LEFT_CORNER_OFFSET.CP(scale_),
+                           geo.width,
+                           horizontal_tex_->GetHeight(),
+                           horizontal_tex_->GetDeviceTexture(),
+                           texxform,
+                           nux::color::White);
+    }
+  }
+
+  double scale_;
+  dash::BaseTexturePtr corner_tex_;
+  dash::BaseTexturePtr left_edge_tex_;
+  dash::BaseTexturePtr horizontal_tex_;
+};
+
+
+Widgets::Widgets()
+  : filter_(std::make_shared<Filter>())
+{
+  auto const& uscreen = UScreen::GetDefault();
+  auto num_monitors = uscreen->GetPluggedMonitorsNumber();
+
+  for (auto i = 0; i < num_monitors; ++i)
+    decos_.push_back(std::make_shared<Decorations>(i));
+
+  uscreen->changed.connect(sigc::track_obj([this] (int, std::vector<nux::Geometry> const& monitors) {
+    auto num_monitors = monitors.size();
+    decos_.reserve(num_monitors);
+
+    while (decos_.size() < num_monitors)
+      decos_.emplace_back(std::make_shared<Decorations>(decos_.size()-1));
+
+    decos_.resize(num_monitors);
+    for (auto i = 0u; i < num_monitors; ++i)
+    {
+      decos_[i]->monitor = i;
+      decos_[i]->monitor.changed.emit(i);
+    }
+  }, *this));
+}
+
+Filter::Ptr Widgets::GetFilter() const
+{
+  return filter_;
+}
+
+} // namespace spread
+} // namespace unity

=== added file 'unity-shared/SpreadWidgets.h'
--- unity-shared/SpreadWidgets.h	1970-01-01 00:00:00 +0000
+++ unity-shared/SpreadWidgets.h	2016-09-06 23:15:10 +0000
@@ -0,0 +1,48 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2016 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Authored by: Marco Trevisan <[e-mail]>
+*/
+
+#ifndef UNITYSHELL_SPREAD_WIDGETS_H
+#define UNITYSHELL_SPREAD_WIDGETS_H
+
+#include "SpreadFilter.h"
+
+namespace unity
+{
+namespace spread
+{
+class Decorations;
+
+class Widgets : public sigc::trackable
+{
+public:
+  typedef std::shared_ptr<Widgets> Ptr;
+
+  Widgets();
+
+  Filter::Ptr GetFilter() const;
+
+private:
+  Filter::Ptr filter_;
+  std::vector<std::shared_ptr<Decorations>> decos_;
+};
+
+} // namespace spread
+} // namespace unity
+
+#endif

=== modified file 'unity-shared/WindowButtons.cpp'
--- unity-shared/WindowButtons.cpp	2016-03-07 18:37:24 +0000
+++ unity-shared/WindowButtons.cpp	2016-09-06 23:15:10 +0000
@@ -420,10 +420,23 @@
   {
     WindowManager& wm = WindowManager::Default();
     Window to_restore = controlled_window();
+    int button = nux::GetGraphicsDisplay()->GetCurrentEvent().GetEventButton();
 
     wm.Raise(to_restore);
     wm.Activate(to_restore);
-    wm.Restore(to_restore);
+
+    if (button == nux::NUX_MOUSE_BUTTON1)
+    {
+      wm.Restore(to_restore);
+    }
+    else if (button == nux::NUX_MOUSE_BUTTON2)
+    {
+      wm.VerticallyMaximize(to_restore);
+    }
+    else if (button == nux::NUX_MOUSE_BUTTON3)
+    {
+      wm.HorizontallyMaximize(to_restore);
+    }
   }
 
   restore_clicked.emit();