Merge lp:~unity-team/unity/trusty-sru-7.2.6 into lp:unity/7.2

[Marco Trevisan (Treviño)]

Releasing 7.2.6

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-16 15:55:07 +0000
+++ CMakeLists.txt	2015-10-20 18:34:31 +0000
@@ -10,7 +10,7 @@
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
 set (UNITY_MINOR 2)
-set (UNITY_MICRO 5)
+set (UNITY_MICRO 6)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
 set (UNITY_COMPONENTS_VERSION "6")
 
=== modified file 'ChangeLog'
--- ChangeLog	2015-04-16 15:55:07 +0000
+++ ChangeLog	2015-10-20 18:34:31 +0000
@@ -1,3 +1,185 @@
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	* Releasing 7.2.6
+	* Updating ChangeLog
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	New stable release
+
[phone]  Andrea Azzarone [e-mail]
+
+	Merge patch from https://launchpadlibrarian.net/216276242/low-gfx-override.patch 
+
[phone]  Chris Townsend  <[e-mail]>
+
+	When looking for the top-most valid window in a VP, also check if the window is focused if the window is set to Always on Top. This allows Launcher icon spread to work properly when a window is minimized an Always on Top exists in the group.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Wait on Spread to be terminated before showing the Quicklist. 
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+	
+	ResultViewGrid: wait for double-click event only if the relative result needs the Preview
+	
+	This was causing a 500ms delay between the user click and some results (apps) activation.
+	Also, at this point, we can get rid of PREVIEW_LEFT_BUTTON activation type. , #1447372
+
[phone]  Chris Townsend  <[e-mail]>
+
+	If dragging an application:// uri type from the Dash to the desktop, change it to a file:// uri type so Nautilus can understand the type a make a copy of it on the desktop. 
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Enable real page up/page down key navigation in the Dash. When using these keys the view scrolls the length of the visible view. 
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Save the active window when showing the Hud so the correct window is focused when hiding the Hud. Fixes issue when "Always on Top" windows are present. 
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Save the active window when showing the Dash so the correct window is focused when hiding the Dash. Fixes issue when "Always on Top" windows are present. 
+
[phone]  Andrea Azzarone [e-mail]
+
+	Properly hide decorations when on "Show Desktop" mode. 
+
[phone]  Andrea Azzarone [e-mail]
+
+	Do not handle events coming from viewports not actually containing the window. 
+
[phone]  Chris Townsend  <[e-mail]>
+
+	When using keyboard navigation in the Dash, skip category headers that are not expandable. Also, do not highlight the category header when the mouse cursor is over it. 
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Also use the Compiz show() method when forcing an unmapped window to be visible when clicking on it's active Launcher icon. 
+
[phone]  Andrea Azzarone [e-mail]
+
+	Make sure new icons are added to the model before calling SortAndUpdate. 
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	OverlayWindowButtons: trigger a queuedraw also when a child requires a redraw 
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Add option to enable and disable Unity low graphics mode on the fly in ccsm or via gsettings. 
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: Request ScreenSaver (de)activation on VT changes
+	
+	Connect to login1 session active property, and monitor its state.
+	When the session is active we can safely request the screensaver to stop. 
+
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.2.5+14.04.20150603-0ubuntu1
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Revert rev. 3810 due to a crash being seen on Trusty when the lockscreen is activated. Fixes: #1451613
+	Approved by: PS Jenkins bot, Stephen M. Webb
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Revert rev. 3810 due to a crash being seen on Trusty when the lockscreen is activated.
+
[phone]  CI Train Bot  <[e-mail]>
+
+	Releasing 7.2.5+14.04.20150521.1-0ubuntu1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	AP tests: accounted for arbitrarily-raised exceptions in checking scaled windows Fixes: #1436095
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	AP tests: accounted for arbitrarily-raised exceptions in checking scaled windows
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Forward first key event that happens on top of the blank window to the lockscreen. Fixes: #1308265
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Forward first key event that happens on top of the blank window to the lockscreen.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Release pointer barrier if launcher is in lock_hide state. Fixes: #1029114
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Release pointer barrier if launcher is in lock_hide state.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Make sure scope_views_[filter.id] exists before using operator[] on it. Fixes: #926979
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Make sure scope_views_[filter.id] exists before using operator[] on it.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not restore focus if a quicklist is opened during launcher key navigation. Fixes: #932486
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not restore focus if a quicklist is opened during launcher key navigation.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	When we quit the quicklist it would check if the mouse was over the launcher, if it wasn't it would fold the launcher. We don't need to check this if we are in keynav as we want all the icons to be unfolded. Fixes: #1246891
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	When we quit the quicklist it would check if the mouse was over the launcher, if it wasn't it would fold the launcher. We don't need to check this if we are in keynav as we want all the icons to be unfolded.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Use a 2 second delay before showing the first run shortcut hints to workaround a race condition on input handling. Fixes: #1313597
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Use a 2 second delay before showing the first run shortcut hints to workaround a race condition on input handling.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Draw osk above unity shell. Fixes: #1413165
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Draw osk above unity shell.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add the possibility to specify the font size and the font weight without chaning the default font name. Fixes: #886478
+	Approved by: Stephen M. Webb, PS Jenkins bot
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add the possibility to specify the font size and the font weight without chaning the default font name.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	* Releasing 7.2.5.
+	* Bump version to 7.2.5.
+
 2015-03-16  CI Train Bot  <[e-mail]>
 
 	Releasing 7.2.4+14.04.20150316-0ubuntu1
 
=== modified file 'UnityCore/GLibDBusProxy.cpp'
--- UnityCore/GLibDBusProxy.cpp	2014-12-16 19:27:36 +0000
+++ UnityCore/GLibDBusProxy.cpp	2015-10-20 18:34:31 +0000
@@ -89,7 +89,7 @@
 
   void OnProxyNameOwnerChanged(GDBusProxy*, GParamSpec*);
   void OnProxySignal(GDBusProxy* proxy, const char*, const char*, GVariant*);
-  void OnPropertyChanged(GDBusProxy*, GVariant*, GStrv*);
+  void OnPropertyChanged(GDBusProxy*, GVariant*, GStrv);
 
   static void OnProxyConnectCallback(GObject* source, GAsyncResult* res, gpointer impl);
   static void OnCallCallback(GObject* source, GAsyncResult* res, gpointer call_data);
@@ -114,7 +114,7 @@
   unsigned reconnection_attempts_;
 
   glib::Signal<void, GDBusProxy*, const char*, const char*, GVariant*> g_signal_connection_;
-  glib::Signal<void, GDBusProxy*, GVariant*, GStrv*> g_property_signal_;
+  glib::Signal<void, GDBusProxy*, GVariant*, GStrv> g_property_signal_;
   glib::Signal<void, GDBusProxy*, GParamSpec*> name_owner_signal_;
   glib::Source::UniquePtr reconnect_timeout_;
   sigc::signal<void> proxy_acquired;
@@ -277,7 +277,7 @@
   }
 }
 
-void DBusProxy::Impl::OnPropertyChanged(GDBusProxy* proxy, GVariant* changed_props, GStrv* invalidated)
+void DBusProxy::Impl::OnPropertyChanged(GDBusProxy* proxy, GVariant* changed_props, GStrv invalidated)
 {
   LOG_DEBUG(logger) << "Properties changed for proxy (" << object_path_ << ")";
 
@@ -303,6 +303,19 @@
 
     g_variant_iter_free (iter);
   }
+
+  for (const gchar *property_name = *invalidated; property_name; property_name = *(++invalidated))
+  {
+    LOG_DEBUG(logger) << "Property: '" << property_name << "' invalidated";
+
+    auto handler_it = property_handlers_.find(property_name);
+
+    if (handler_it != property_handlers_.end())
+    {
+      for (ReplyCallback const& callback : handler_it->second)
+        callback(nullptr);
+    }
+  }
 }
 
 void DBusProxy::Impl::WaitForProxy(GCancellable* cancellable,
 
=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2015-03-16 17:29:46 +0000
+++ UnityCore/GnomeSessionManager.cpp	2015-10-20 18:34:31 +0000
@@ -104,7 +104,8 @@
     login_proxy_ = std::make_shared<glib::DBusProxy>(test_mode_ ? testing::DBUS_NAME : "org.freedesktop.login1",
                                                      "/org/freedesktop/login1/session/" + glib::gchar_to_string(session_id),
                                                      "org.freedesktop.login1.Session",
-                                                     test_mode_ ? G_BUS_TYPE_SESSION : G_BUS_TYPE_SYSTEM);
+                                                     test_mode_ ? G_BUS_TYPE_SESSION : G_BUS_TYPE_SYSTEM,
+                                                     G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES);
 
     login_proxy_->Connect("Lock", [this](GVariant*){
       manager_->PromptLockScreen();
@@ -113,6 +114,10 @@
     login_proxy_->Connect("Unlock", [this](GVariant*){
       manager_->unlock_requested.emit();
     });
+
+    login_proxy_->ConnectProperty("Active", [this] (GVariant* active) {
+      manager_->screensaver_requested.emit(!glib::Variant(active).GetBool());
+    });
   }
 
   {
 
=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2014-07-24 14:03:10 +0000
+++ dash/DashController.cpp	2015-10-20 18:34:31 +0000
@@ -308,6 +308,8 @@
     return false;
   }
 
+  wm.SaveInputFocus();
+
   EnsureDash();
   monitor_ = GetIdealMonitor();
   screen_ungrabbed_slot_->disconnect();
 
=== modified file 'dash/DashController.h'
--- dash/DashController.h	2014-04-25 02:42:01 +0000
+++ dash/DashController.h	2015-10-20 18:34:31 +0000
@@ -21,7 +21,6 @@
 
 #include <memory>
 
-#include <gdk/gdk.h>
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/GLibDBusServer.h>
 #include <UnityCore/GLibSignal.h>
 
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2015-05-15 15:52:31 +0000
+++ dash/DashView.cpp	2015-10-20 18:34:31 +0000
@@ -59,7 +59,7 @@
 const RawPixel PREVIEW_CONTAINER_TRIANGLE_WIDTH = 14_em;
 const RawPixel PREVIEW_CONTAINER_TRIANGLE_HEIGHT = 12_em;
 
-const int MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT = 1000;
+const int MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT = 300;
 }
 
 // This is so we can access some protected members in nux::VLayout and
@@ -120,7 +120,6 @@
   , preview_displaying_(false)
   , preview_navigation_mode_(previews::Navigation::NONE)
   , last_activated_timestamp_(0)
-  , search_in_progress_(false)
   , activate_on_finish_(false)
   , visible_(false)
   , opening_column_x_(-1)
@@ -1221,21 +1220,27 @@
 
 void DashView::OnSearchChanged(std::string const& search_string)
 {
-  search_in_progress_ = true;
+  activate_on_finish_ = false;
 }
 
 void DashView::OnLiveSearchReached(std::string const& search_string)
 {
-  // reset and set it again once we're sure a search is happening
-  search_in_progress_ = false;
-
   LOG_DEBUG(logger) << "Live search reached: " << search_string;
-  if (active_scope_view_)
+  if (!active_scope_view_.IsValid())
+    return;
+
+  if (active_scope_view_->PerformSearch(search_string, sigc::mem_fun(this, &DashView::OnScopeSearchFinished)))
   {
-    if (active_scope_view_->PerformSearch(search_string, sigc::mem_fun(this, &DashView::OnScopeSearchFinished)))
-    {
-      search_in_progress_ = true;
-    }
+    activate_delay_.reset(new glib::Timeout(MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT, [this] {
+      if (activate_on_finish_)
+      {
+        activate_on_finish_ = false;
+        active_scope_view_->ActivateFirst();
+      }
+
+      activate_delay_.reset();
+      return false;
+    }));
   }
 }
 
@@ -1254,12 +1259,15 @@
       LOG_DEBUG(logger) << "Search completed: " << search_string;
 
     search_bar_->SetSearchFinished();
-    search_in_progress_ = false;
-
-    activate_timeout_.reset();
-    if (activate_on_finish_ && !err)
-      OnEntryActivated();
-    activate_on_finish_= false;
+
+    if (activate_on_finish_)
+    {
+      activate_on_finish_ = false;
+      activate_delay_.reset();
+
+      if (!err)
+        active_scope_view_->ActivateFirst();
+    }
   }
 }
 
@@ -1407,20 +1415,12 @@
 }
 void DashView::OnEntryActivated()
 {
-  if (active_scope_view_.IsValid() && !search_in_progress_)
-  {
-    active_scope_view_->ActivateFirst();
-  }
-  // delay the activation until we get the SearchFinished signal
-  activate_on_finish_ = search_in_progress_;
-
-  if (activate_on_finish_)
-  {
-    activate_timeout_.reset(new glib::Timeout(MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT, [this] {
-      activate_on_finish_ = false;
+  if (active_scope_view_.IsValid())
+  {
+    if (!activate_delay_ && !search_bar_->in_live_search())
       active_scope_view_->ActivateFirst();
-      return FALSE;
-    }));
+    else
+      activate_on_finish_ = true;
   }
 }
 
@@ -1546,6 +1546,32 @@
     ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 }
 
+nux::Area* DashView::SkipUnexpandableHeaderKeyNav()
+{
+  PlacesGroup::Ptr prev_view;
+  auto category_views = active_scope_view_->GetOrderedCategoryViews();
+
+  for (auto category : category_views)
+  {
+    if (category->GetLayout() != nullptr)
+    {
+      auto header = category->GetHeaderFocusableView();
+      if (header && header->HasKeyFocus() && !category->IsExpandable())
+      {
+        if (prev_view)
+          return prev_view->GetChildView();
+        else
+          return search_bar_->text_entry();
+      }
+
+      if (category->IsVisible())
+        prev_view = category;
+    }
+  }
+
+  return nullptr;
+}
+
 nux::Area* DashView::FindKeyFocusArea(unsigned int key_symbol,
                                       unsigned long x11_key_code,
                                       unsigned long special_keys_state)
@@ -1576,11 +1602,9 @@
     direction = KEY_NAV_RIGHT;
     break;
   case NUX_VK_LEFT_TAB:
-  case NUX_VK_PAGE_UP:
     direction = KEY_NAV_TAB_PREVIOUS;
     break;
   case NUX_VK_TAB:
-  case NUX_VK_PAGE_DOWN:
     direction = KEY_NAV_TAB_NEXT;
     break;
   case NUX_VK_ENTER:
@@ -1588,6 +1612,14 @@
     // Not sure if Enter should be a navigation key
     direction = KEY_NAV_ENTER;
     break;
+  case NUX_VK_PAGE_UP:
+  case NUX_VK_PAGE_DOWN:
+    if (!preview_displaying_)
+    {
+      active_scope_view_->PerformPageNavigation((x11_key_code == NUX_VK_PAGE_UP) ? ScrollDir::UP : ScrollDir::DOWN);
+      return nux::GetWindowCompositor().GetKeyFocusArea();
+    }
+    break;
   default:
     auto const& close_key = WindowManager::Default().close_window_key();
 
@@ -1691,6 +1723,14 @@
     }
   }
 
+  if (direction == KEY_NAV_UP)
+  {
+    if (auto skip_view = SkipUnexpandableHeaderKeyNav())
+    {
+      return skip_view;
+    }
+  }
+
   bool search_key = false;
 
   if (direction == KEY_NAV_NONE)
 
=== modified file 'dash/DashView.h'
--- dash/DashView.h	2014-07-24 13:49:53 +0000
+++ dash/DashView.h	2015-10-20 18:34:31 +0000
@@ -137,6 +137,8 @@
 
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
+  nux::Area* SkipUnexpandableHeaderKeyNav();
+
   UBusManager ubus_manager_;
   Scopes::Ptr scopes_;
   ScopeViews scope_views_;
@@ -170,10 +172,8 @@
 
   LocalResult last_activated_result_;
   guint64 last_activated_timestamp_;
-  bool search_in_progress_;
   bool activate_on_finish_;
-  glib::Source::UniquePtr activate_timeout_;
-
+  glib::Source::UniquePtr activate_delay_;
   bool visible_;
 
   nux::ObjectPtr<nux::IOpenGLBaseTexture> dash_view_copy_;
 
=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2014-07-24 14:14:47 +0000
+++ dash/PlacesGroup.cpp	2015-10-20 18:34:31 +0000
@@ -212,7 +212,12 @@
     if(direction == nux::KEY_NAV_UP)
       nux::GetWindowCompositor().SetKeyFocusArea(_child_view, direction);
     else
-      nux::GetWindowCompositor().SetKeyFocusArea(GetHeaderFocusableView(), direction);
+    {
+      if (IsExpandable())
+        nux::GetWindowCompositor().SetKeyFocusArea(GetHeaderFocusableView(), direction);
+      else
+        nux::GetWindowCompositor().SetKeyFocusArea(_child_view, direction);
+    }
   });
 
   UpdatePlacesGroupSize();
@@ -567,6 +572,12 @@
 }
 
 bool
+PlacesGroup::IsExpandable() const
+{
+  return (_n_visible_items_in_unexpand_mode < _n_total_items);
+}
+
+bool
 PlacesGroup::GetExpanded() const
 {
   return _is_expanded;
@@ -649,7 +660,7 @@
 
 bool PlacesGroup::ShouldBeHighlighted() const
 {
-  return HeaderHasKeyFocus();
+  return (HeaderHasKeyFocus() && IsExpandable());
 }
 
 void PlacesGroup::SetResultsPreviewAnimationValue(float preview_animation)
 
=== modified file 'dash/PlacesGroup.h'
--- dash/PlacesGroup.h	2014-03-20 04:05:39 +0000
+++ dash/PlacesGroup.h	2015-10-20 18:34:31 +0000
@@ -77,6 +77,7 @@
 
   void SetCounts(unsigned n_total_items);
 
+  virtual bool IsExpandable() const;
   virtual void SetExpanded(bool is_expanded);
   virtual bool GetExpanded() const;
 
 
=== modified file 'dash/ResultView.cpp'
--- dash/ResultView.cpp	2014-03-20 05:13:04 +0000
+++ dash/ResultView.cpp	2015-10-20 18:34:31 +0000
@@ -23,6 +23,7 @@
 
 #include "ResultView.h"
 
+#include <boost/algorithm/string.hpp>
 #include <Nux/Layout.h>
 
 #include "unity-shared/IntrospectableWrappers.h"
@@ -49,6 +50,7 @@
   , scale(DEFAULT_SCALE)
   , renderer_(NULL)
   , cached_result_(nullptr, nullptr, nullptr)
+  , default_click_activation_(ActivateType::PREVIEW)
 {
   expanded.changed.connect([this](bool value)
   {
@@ -61,6 +63,21 @@
     NeedRedraw();
   });
 
+  default_click_activation.SetGetterFunction([this] {
+    if (Settings::Instance().double_click_activate())
+      return default_click_activation_;
+    return ActivateType::DIRECT;
+  });
+
+  default_click_activation.SetSetterFunction([this] (ActivateType at) {
+    if (default_click_activation_ != at)
+    {
+      default_click_activation_ = at;
+      return true;
+    }
+    return false;
+  });
+
   Settings::Instance().font_scaling.changed.connect(sigc::mem_fun(this, &ResultView::UpdateFontScale));
   enable_texture_render.changed.connect(sigc::mem_fun(this, &ResultView::OnEnableRenderToTexture));
   scale.changed.connect(sigc::mem_fun(this, &ResultView::UpdateScale));
@@ -208,6 +225,14 @@
   return LocalResult(*GetIteratorAtRow(index));
 }
 
+ResultView::ActivateType ResultView::GetLocalResultActivateType(LocalResult const& result) const
+{
+  if (boost::starts_with(result.uri, "x-unity-no-preview"))
+    return ActivateType::DIRECT;
+
+  return ActivateType::PREVIEW;
+}
+
 void ResultView::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {}
 
 
=== modified file 'dash/ResultView.h'
--- dash/ResultView.h	2014-03-20 05:13:04 +0000
+++ dash/ResultView.h	2015-10-20 18:34:31 +0000
@@ -58,12 +58,11 @@
 class ResultView : public nux::View, public debug::Introspectable
 {
 public:
-  typedef enum ActivateType_
+  enum class ActivateType
   {
     DIRECT,
-    PREVIEW_LEFT_BUTTON,
     PREVIEW
-  } ActivateType;
+  };
 
   NUX_DECLARE_OBJECT_TYPE(ResultView, nux::View);
 
@@ -73,8 +72,9 @@
   void SetModelRenderer(ResultRenderer* renderer);
   void SetResultsModel(Results::Ptr const& results);
 
-  unsigned int GetIndexForLocalResult(LocalResult const& local_result);
+  unsigned int GetIndexForLocalResult(LocalResult const&);
   LocalResult GetLocalResultForIndex(unsigned int);
+  ActivateType GetLocalResultActivateType(LocalResult const&) const;
 
   nux::Property<bool> expanded;
   nux::Property<int> results_per_row;
@@ -82,6 +82,7 @@
   nux::Property<float> desaturation_progress;
   nux::Property<bool> enable_texture_render;
   nux::Property<double> scale;
+  nux::RWProperty<ActivateType> default_click_activation;
 
   sigc::signal<void, LocalResult const&, ActivateType, GVariant*> ResultActivated;
 
@@ -130,6 +131,7 @@
   void UpdateFontScale(double scale);
 
   Result cached_result_;
+  ActivateType default_click_activation_;
   connection::Manager result_connections_;
 };
 
 
=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2014-03-20 04:05:39 +0000
+++ dash/ResultViewGrid.cpp	2015-10-20 18:34:31 +0000
@@ -24,9 +24,8 @@
 #include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include <NuxGraphics/GdkGraphics.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include <unity-protocol.h>
+#include <boost/algorithm/string.hpp>
 
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/Timer.h"
@@ -34,8 +33,8 @@
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/GraphicsUtils.h"
 #include "unity-shared/RawPixel.h"
-#include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
+#include <UnityCore/DesktopUtilities.h>
 #include "ResultViewGrid.h"
 #include "math.h"
 
@@ -58,6 +57,8 @@
 
   const RawPixel WIDTH_PADDING   = 25_em;
   const RawPixel SCROLLBAR_WIDTH =  3_em;
+
+  const std::string APPLICATION_URI_PREFIX = "application://";
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(ResultViewGrid);
@@ -94,8 +95,7 @@
   scale.changed.connect(sigc::mem_fun(this, &ResultViewGrid::UpdateScale));
 
   key_nav_focus_change.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyNavFocusChange));
-  key_nav_focus_activate.connect([this] (nux::Area *area)
-  {
+  key_nav_focus_activate.connect([this] (nux::Area *area) {
     Activate(focused_result_, selected_index_, ResultView::ActivateType::DIRECT);
   });
   key_down.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyDown));
@@ -210,6 +210,12 @@
     row_y += row_index * row_height;
   }
 
+  if (type == ActivateType::PREVIEW)
+  {
+    if (GetLocalResultActivateType(local_result) != type)
+      type = ActivateType::DIRECT;
+  }
+
   active_index_ = index;
   guint64 timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
   glib::Variant data(g_variant_new("(tiiiiii)", timestamp, column_x, row_y, column_width, row_height, left_results, right_results));
@@ -796,6 +802,7 @@
   unsigned num_results = GetNumResults();
   unsigned index = GetIndexAtPosition(x, y);
   mouse_over_index_ = index;
+
   if (index < num_results)
   {
     // we got a click on a button so activate it
@@ -805,32 +812,32 @@
     focused_result_ = result;
     activated_result_ = result;
 
-
     if (nux::GetEventButton(button_flags) == nux::NUX_MOUSE_BUTTON1)
     {
-      if (unity::Settings::Instance().double_click_activate)
+      if (default_click_activation() == ActivateType::PREVIEW &&
+          GetLocalResultActivateType(activated_result_) == ActivateType::PREVIEW)
       {
         // delay activate for single left click. (for double click check)
-        activate_timer_.reset(new glib::Timeout(DOUBLE_CLICK_SPEED, [this, index]() {
-          Activate(activated_result_, index, ResultView::ActivateType::PREVIEW_LEFT_BUTTON);
+        activate_timer_.reset(new glib::Timeout(DOUBLE_CLICK_SPEED, [this, index] {
+          Activate(activated_result_, index, ActivateType::PREVIEW);
           return false;
         }));
       }
       else
       {
-        Activate(activated_result_, index, ResultView::ActivateType::DIRECT);
+        Activate(activated_result_, index, ActivateType::DIRECT);
       }
     }
     else
     {
-       Activate(activated_result_, index, ResultView::ActivateType::PREVIEW);
+      Activate(activated_result_, index, ActivateType::PREVIEW);
     }
   }
 }
 
 void ResultViewGrid::MouseDoubleClick(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  if (unity::Settings::Instance().double_click_activate == false)
+  if (default_click_activation() == ActivateType::DIRECT)
     return;
 
   unsigned num_results = GetNumResults();
@@ -845,7 +852,7 @@
     focused_result_ = result;
 
     activated_result_ = result;
-    Activate(activated_result_, index, ResultView::ActivateType::DIRECT);
+    Activate(activated_result_, index, ActivateType::DIRECT);
   }
 }
 
@@ -916,6 +923,15 @@
   if (current_drag_result_.empty())
     current_drag_result_.uri = current_drag_result_.uri.substr(current_drag_result_.uri.find(":") + 1);
 
+  if (boost::starts_with(current_drag_result_.uri, APPLICATION_URI_PREFIX))
+  {
+    auto desktop_id = current_drag_result_.uri.substr(APPLICATION_URI_PREFIX.size());
+    auto desktop_path = DesktopUtilities::GetDesktopPathById(desktop_id);
+
+    if (!desktop_path.empty())
+      current_drag_result_.uri = "file://" + desktop_path;
+  }
+
   LOG_DEBUG (logger) << "Dnd begin at " <<
                      last_mouse_down_x_ << ", " << last_mouse_down_y_ << " - using; "
                      << current_drag_result_.uri;
 
=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2014-08-06 14:09:30 +0000
+++ dash/ScopeView.cpp	2015-10-20 18:34:31 +0000
@@ -481,47 +481,40 @@
   /* Reset result count */
   counts_[group] = 0;
 
-  ResultView* results_view = nullptr;
+  auto* results_view = new ResultViewGrid(NUX_TRACKER_LOCATION);
+
   if (category.GetContentType() == "social" && category.renderer_name == "default")
   {
-    results_view = new ResultViewGrid(NUX_TRACKER_LOCATION);
     results_view->SetModelRenderer(new ResultRendererHorizontalTile(NUX_TRACKER_LOCATION));
-    static_cast<ResultViewGrid*> (results_view)->horizontal_spacing = CARD_VIEW_GAP_HORIZ.CP(scale());
-    static_cast<ResultViewGrid*> (results_view)->vertical_spacing   = CARD_VIEW_GAP_VERT.CP(scale());
+    results_view->horizontal_spacing = CARD_VIEW_GAP_HORIZ.CP(scale());
+    results_view->vertical_spacing   = CARD_VIEW_GAP_VERT.CP(scale());
   }
   else
   {
-    results_view = new ResultViewGrid(NUX_TRACKER_LOCATION);
     results_view->SetModelRenderer(new ResultRendererTile(NUX_TRACKER_LOCATION));
   }
 
   if (scope_)
   {
-    const std::string category_id = category.id();
-    std::string unique_id = category.name() + scope_->name();
-    results_view->unique_id = unique_id;
+    results_view->unique_id = name + scope_->name();
     results_view->expanded = false;
 
-    results_view->ResultActivated.connect([this, unique_id, category_id] (LocalResult const& local_result, ResultView::ActivateType type, GVariant* data)
-    {
-      if (g_str_has_prefix(local_result.uri.c_str(), "x-unity-no-preview"))
-        type = ResultView::ActivateType::DIRECT;
-
-      // Applications scope results should be activated on left-click (instead of preview). Note that app scope can still
-      // respond with preview for activation request (the case for uninstalled apps).
-      bool is_app_scope_result = (scope_->id() == "applications.scope" || (scope_->id() == "home.scope" && category_id == "applications.scope"));
-
-      if (is_app_scope_result && type == ResultView::ActivateType::PREVIEW_LEFT_BUTTON)
-        type = ResultView::ActivateType::DIRECT;
-
-      result_activated.emit(type, local_result, data, unique_id);
+    if (scope_->id() == "applications.scope" ||
+        (scope_->id() == "home.scope" && category.id() == "applications.scope"))
+    {
+      results_view->default_click_activation = ResultView::ActivateType::DIRECT;
+    }
+
+    results_view->ResultActivated.connect([this, results_view] (LocalResult const& local_result, ResultView::ActivateType type, GVariant* data)
+    {
+      result_activated.emit(type, local_result, data, results_view->unique_id());
+
       switch (type)
       {
         case ResultView::ActivateType::DIRECT:
         {
           scope_->Activate(local_result, nullptr, cancellable_);
         } break;
-        case ResultView::ActivateType::PREVIEW_LEFT_BUTTON:
         case ResultView::ActivateType::PREVIEW:
         {
           scope_->Preview(local_result, nullptr, cancellable_);
@@ -1007,6 +1000,11 @@
   scroll_view_->ScrollToPosition(nux::Geometry(0, 0, 0, 0));
 }
 
+void ScopeView::PerformPageNavigation(ScrollDir dir)
+{
+  scroll_view_->page_direction.emit(dir);
+}
+
 void ScopeView::ActivateFirst()
 {
   if (!scope_)
 
=== modified file 'dash/ScopeView.h'
--- dash/ScopeView.h	2014-08-06 14:09:30 +0000
+++ dash/ScopeView.h	2015-10-20 18:34:31 +0000
@@ -36,6 +36,7 @@
 #include "PlacesGroup.h"
 #include "ResultViewGrid.h"
 #include "unity-shared/UBusWrapper.h"
+#include "unity-shared/PlacesOverlayVScrollBar.h"
 
 namespace unity
 {
@@ -61,6 +62,7 @@
   int GetNumRows();
   void AboutToShow();
   void JumpToTop();
+  void PerformPageNavigation(ScrollDir dir);
 
   virtual void ActivateFirst();
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-06-03 15:22:38 +0000
+++ debian/changelog	2015-10-20 18:34:31 +0000
@@ -1,3 +1,54 @@
+unity (7.2.6-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+  [ Andrea Azzarone ]
+  * Merge patch from https://launchpadlibrarian.net/216276242/low-gfx-
+    override.patch (LP: #1491913)
+  * Properly hide decorations when on "Show Desktop" mode. (LP: #1485073)
+  * Do not handle events coming from viewports not actually containing the window.
+    (LP: #1449654)
+  * Make sure new icons are added to the model before calling SortAndUpdate
+    (LP: #1458950)
+  * GnomeSessionManager: Do not allow shutdown when screen is locked. (LP: #1460626)
+
+  [ Chris Townsend ]
+  * When looking for the top-most valid window in a VP, also check if the window
+    is focused if the window is set to Always on Top. This allows Launcher icon
+    spread to work properly when a window is minimized an Always on Top exists in
+    the group. (LP: #1131385)
+  * Wait on Spread to be terminated before showing the Quicklist. (LP: #1441626)
+  * If dragging an application:// uri type from the Dash to the desktop, change it
+    to a file:// uri type so Nautilus can understand the type a make a copy of it
+    on the desktop. (LP: #1241972)
+  * Enable real page up/page down key navigation in the Dash. When using these
+    keys the view scrolls the length of the visible view. (LP: #913612)
+  * Save the active window when showing the Hud so the correct window is focused
+    when hiding the Hud. Fixes issue when "Always on Top" windows are present.
+    (LP: #1366583)
+  * Save the active window when showing the Dash so the correct window is focused
+    when hiding the Dash. Fixes issue when "Always on Top" windows are present.
+    (LP: #1446634)
+  * When using keyboard navigation in the Dash, skip category headers that are not
+    expandable. Also, do not highlight the category header when the mouse cursor
+    is over it. (LP: #1045933)
+  * Also use the Compiz show() method when forcing an unmapped window to be
+    visible when clicking on it's active Launcher icon. (LP: #989588)
+  * Add option to enable and disable Unity low graphics mode on the fly in ccsm or
+    via gsettings. (LP: #1412937)
+
+  [ Marco Trevisan (Treviño) ]
+  * ResultViewGrid: wait for double-click event only if the relative result needs
+    the Preview (LP: #1291950)
+  * OverlayWindowButtons: trigger a queuedraw also when a child requires a redraw
+    (LP: #1461618)
+  * GnomeSessionManager: Request ScreenSaver (de)activation on VT changes (LP:
+    #1405349)
+  * UScreen, PanelService: get monitor at position, ignoring pre-multipled Gdk
+    scale factor (LP: #1351591)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 15 Oct 2015 17:35:51 +0100
+
 unity (7.2.5+14.04.20150603-0ubuntu1) trusty; urgency=medium
 
   [ Chris Townsend ]
 
=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2015-03-12 00:57:05 +0000
+++ decorations/DecoratedWindow.cpp	2015-10-20 18:34:31 +0000
@@ -840,6 +840,11 @@
   , impl_(new Impl(this, cwin))
 {}
 
+CompWindow* Window::GetCompWindow()
+{
+  return impl_->win_;
+}
+
 void Window::Update()
 {
   impl_->Update();
 
=== modified file 'decorations/DecoratedWindow.h'
--- decorations/DecoratedWindow.h	2014-03-03 19:07:56 +0000
+++ decorations/DecoratedWindow.h	2015-10-20 18:34:31 +0000
@@ -45,6 +45,7 @@
   nux::Property<bool> scaled;
   nux::ROProperty<double> dpi_scale;
 
+  CompWindow* GetCompWindow();
   void Update();
   void Undecorate();
   void UpdateDecorationPosition();
 
=== modified file 'decorations/DecorationsManager.cpp'
--- decorations/DecorationsManager.cpp	2015-03-12 00:57:05 +0000
+++ decorations/DecorationsManager.cpp	2015-10-20 18:34:31 +0000
@@ -178,7 +178,7 @@
 {
   auto const& win = GetWindowByXid(xid);
 
-  if (win && !win->impl_->win_->hasUnmapReference())
+  if (win && !win->GetCompWindow()->hasUnmapReference())
   {
     win->Update();
     return true;
@@ -312,6 +312,10 @@
 bool Manager::Impl::HandleFrameEvent(XEvent* event)
 {
   auto const& win = GetWindowByFrame(event->xany.window);
+  CompWindow* comp_window = win ? win->GetCompWindow() : nullptr;
+
+  if (comp_window && comp_window->defaultViewport() != screen->vp())
+    return false;
 
   // ButtonRelease events might happen also outside the frame window, in this
   // case we must unset the mouse owner, wherever the event happens.
 
=== modified file 'hud/HudButton.cpp'
--- hud/HudButton.cpp	2014-07-24 14:20:30 +0000
+++ hud/HudButton.cpp	2015-10-20 18:34:31 +0000
@@ -20,11 +20,6 @@
  */
 #include "config.h"
 
-#include <pango/pango.h>
-#include <pango/pangocairo.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
 #include <Nux/Nux.h>
 #include <Nux/HLayout.h>
 #include <NuxCore/Logger.h>
 
=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2014-07-24 14:20:30 +0000
+++ hud/HudController.cpp	2015-10-20 18:34:31 +0000
@@ -372,6 +372,8 @@
     focused_app_icon_ = PKGDATADIR "/launcher_bfb.png";
   }
 
+  wm.SaveInputFocus();
+
   LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
   SetIcon(focused_app_icon_);
   FocusWindow();
 
=== modified file 'hud/HudController.h'
--- hud/HudController.h	2014-07-24 14:20:30 +0000
+++ hud/HudController.h	2015-10-20 18:34:31 +0000
@@ -22,7 +22,6 @@
 #include <functional>
 #include <memory>
 
-#include <gdk/gdk.h>
 #include <UnityCore/Hud.h>
 #include <UnityCore/GLibSignal.h>
 
 
=== modified file 'launcher/DeviceNotificationDisplayImp.cpp'
--- launcher/DeviceNotificationDisplayImp.cpp	2013-10-03 23:48:48 +0000
+++ launcher/DeviceNotificationDisplayImp.cpp	2015-10-20 18:34:31 +0000
@@ -17,7 +17,6 @@
  * Authored by: Andrea Azzarone <[e-mail]>
  */
 
-#include <gdk/gdk.h>
 #include "config.h"
 #include <glib/gi18n-lib.h>
 #include <libnotify/notify.h>
 
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2015-05-15 14:50:28 +0000
+++ launcher/LauncherController.cpp	2015-10-20 18:34:31 +0000
@@ -759,14 +759,14 @@
     *uri_ptr = new_uri;
   });
 
+  model_->AddIcon(icon);
+
   if (icon->GetIconType() == AbstractLauncherIcon::IconType::APPLICATION)
   {
     icon->visibility_changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::SortAndUpdate)));
     SortAndUpdate();
   }
 
-  model_->AddIcon(icon);
-
   std::string const& path = icon->DesktopFile();
 
   if (!path.empty())
 
=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2015-05-15 14:50:28 +0000
+++ launcher/LauncherIcon.cpp	2015-10-20 18:34:31 +0000
@@ -577,10 +577,6 @@
   }
 
   WindowManager& win_manager = WindowManager::Default();
-
-  if (win_manager.IsScaleActive())
-    win_manager.TerminateScale();
-
   auto const& pos = GetTipPosition(monitor);
 
   /* If the expo plugin is active, we need to wait it to be terminated, before
@@ -593,6 +589,15 @@
       conn->disconnect();
     });
   }
+  else if (win_manager.IsScaleActive())
+  {
+    auto conn = std::make_shared<sigc::connection>();
+    *conn = win_manager.terminate_spread.connect([this, conn, pos, restore_input_focus] {
+      QuicklistManager::Default()->ShowQuicklist(_quicklist, pos.x, pos.y, restore_input_focus);
+      conn->disconnect();
+    });
+    win_manager.TerminateScale();
+  }
   else
   {
     QuicklistManager::Default()->ShowQuicklist(_quicklist, pos.x, pos.y, restore_input_focus);
 
=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2014-03-06 16:26:34 +0000
+++ panel/PanelView.cpp	2015-10-20 18:34:31 +0000
@@ -64,6 +64,7 @@
   auto& wm = WindowManager::Default();
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &PanelView::ForceUpdateBackground));
   Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &PanelView::Resize));
+  Settings::Instance().low_gfx_changed.connect(sigc::mem_fun(this, &PanelView::OnLowGfxChanged));
 
   wm.average_color.changed.connect(sigc::mem_fun(this, &PanelView::OnBackgroundUpdate));
   wm.initiate_spread.connect(sigc::mem_fun(this, &PanelView::OnSpreadInitiate));
@@ -252,6 +253,22 @@
   EnableOverlayMode(false);
 }
 
+void PanelView::OnLowGfxChanged()
+{
+  if (!Settings::Instance().GetLowGfxMode())
+  {
+    nux::ROPConfig rop;
+
+    rop.Blend = true;
+    rop.SrcBlend = GL_ZERO;
+    rop.DstBlend = GL_SRC_COLOR;
+    nux::Color darken_colour = nux::Color(0.9f, 0.9f, 0.9f, 1.0f);
+    bg_darken_layer_.reset(new nux::ColorLayer(darken_colour, false, rop));
+  }
+
+  ForceUpdateBackground();
+}
+
 void PanelView::AddPanelView(PanelIndicatorsView* child,
                              unsigned int stretchFactor)
 {
@@ -540,6 +557,7 @@
   is_dirty_ = true;
   UpdateBackground();
 
+  QueueRelayout();
   QueueDraw();
 }
 
 
=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2014-03-06 16:26:34 +0000
+++ panel/PanelView.h	2015-10-20 18:34:31 +0000
@@ -98,6 +98,7 @@
   void OnOverlayHidden(GVariant *data);
   void OnSpreadInitiate();
   void OnSpreadTerminate();
+  void OnLowGfxChanged();
   void EnableOverlayMode(bool);
 
   bool ActivateFirstSensitive();
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-06-03 12:46:12 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-10-20 18:34:31 +0000
@@ -259,10 +259,16 @@
       renderer.find("Mesa X11") != std::string::npos ||
       renderer.find("LLVM") != std::string::npos ||
       renderer.find("on softpipe") != std::string::npos ||
-      (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1))
+      (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1) ||
+       optionGetLowGraphicsMode())
     {
       unity_settings_.SetLowGfxMode(true);
     }
+
+  if (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 0)
+  {
+    unity_settings_.SetLowGfxMode(false);
+  }
 #endif
 
   if (!failed)
@@ -340,6 +346,7 @@
      optionSetAutohideAnimationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetDashBlurExperimentalNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetShortcutOverlayNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+     optionSetLowGraphicsModeNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetShowLauncherInitiate(boost::bind(&UnityScreen::showLauncherKeyInitiate, this, _1, _2, _3));
      optionSetShowLauncherTerminate(boost::bind(&UnityScreen::showLauncherKeyTerminate, this, _1, _2, _3));
      optionSetKeyboardFocusInitiate(boost::bind(&UnityScreen::setKeyboardFocusKeyInitiate, this, _1, _2, _3));
@@ -1223,7 +1230,6 @@
 
   window->updateFrameRegionSetCurrentIndex(MAXSHORT);
   window->updateFrameRegion(region);
-  deco_win_->UpdateFrameRegion(region);
   window->updateFrameRegionSetCurrentIndex(oldUpdateFrameRegionIndex);
 }
 
@@ -3595,6 +3601,14 @@
     case UnityshellOptions::ShortcutOverlay:
       shortcut_controller_->SetEnabled(optionGetShortcutOverlay());
       break;
+    case UnityshellOptions::LowGraphicsMode:
+      if (optionGetLowGraphicsMode())
+          BackgroundEffectHelper::blur_type = BLUR_NONE;
+      else
+          BackgroundEffectHelper::blur_type = (unity::BlurType)optionGetDashBlurExperimental();
+
+      unity::Settings::Instance().SetLowGfxMode(optionGetLowGraphicsMode());
+      break;
     case UnityshellOptions::DecayRate:
       launcher_options->edge_decay_rate = optionGetDecayRate() * 100;
       break;
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2014-04-07 03:21:46 +0000
+++ plugins/unityshell/unityshell.xml.in	2015-10-20 18:34:31 +0000
@@ -146,6 +146,12 @@
                   <_long>Enables possibility to display an overlay showing available mouse and keyboard shortcuts.</_long>
                   <default>true</default>
                 </option>
+
+                <option name="low_graphics_mode"  type="bool">
+                  <_short>Enable Low Graphics Mode</_short>
+                  <_long>Enables low graphics mode regardless of hardware in the system</_long>
+                  <default>false</default>
+                </option>
             </group>
 
             <group>
 
=== modified file 'unity-shared/BGHash.cpp'
--- unity-shared/BGHash.cpp	2015-03-11 20:54:31 +0000
+++ unity-shared/BGHash.cpp	2015-10-20 18:34:31 +0000
@@ -116,8 +116,11 @@
                       .SetDuration(skip_animation ? 0 : TRANSITION_DURATION)
                       .Start();
 
-  // This will make sure that the animation starts even if the screen is idle.
-  nux::GetWindowThread()->RequestRedraw();
+  if (nux::WindowThread* wt = nux::GetWindowThread())
+  {
+    // This will make sure that the animation starts even if the screen is idle.
+    wt->RequestRedraw();
+  }
 }
 
 void BGHash::OnTransitionUpdated(nux::Color const& new_color)
 
=== modified file 'unity-shared/CompizUtils.cpp'
--- unity-shared/CompizUtils.cpp	2014-12-16 19:35:06 +0000
+++ unity-shared/CompizUtils.cpp	2015-10-20 18:34:31 +0000
@@ -190,9 +190,6 @@
   if (win->wmType() & (CompWindowTypeDockMask | CompWindowTypeDesktopMask))
     return elements;
 
-  if (win->inShowDesktopMode())
-    return elements;
-
   auto const& region = win->region();
   bool rectangular = (region.numRects() == 1);
   bool alpha = win->alpha();
 
=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2014-07-24 14:14:47 +0000
+++ unity-shared/OverlayRenderer.cpp	2015-10-20 18:34:31 +0000
@@ -116,6 +116,8 @@
 {
   parent->scale = Settings::Instance().em()->DPIScale();
   parent->scale.changed.connect(sigc::hide(sigc::mem_fun(this, &OverlayRendererImpl::LoadScaledTextures)));
+  Settings::Instance().low_gfx_changed.connect(sigc::mem_fun(this, &OverlayRendererImpl::UpdateTextures));
+
   UpdateTextures();
   LoadScaledTextures();
 }
 
=== modified file 'unity-shared/OverlayScrollView.cpp'
--- unity-shared/OverlayScrollView.cpp	2014-08-06 14:09:30 +0000
+++ unity-shared/OverlayScrollView.cpp	2015-10-20 18:34:31 +0000
@@ -50,7 +50,11 @@
   scale.changed.connect([this] (double scale) {
     m_MouseWheelScrollSize = MOUSE_WHEEL_SCROLL_SIZE.CP(scale);
   });
+
+  page_direction.connect([scrollbar] (ScrollDir dir) {
+      scrollbar->PerformPageNavigation(dir);
+  });
 }
 
 } // dash namespace
-} // unity namespace
 \ No newline at end of file
+} // unity namespace
 
=== modified file 'unity-shared/OverlayScrollView.h'
--- unity-shared/OverlayScrollView.h	2014-08-06 14:09:30 +0000
+++ unity-shared/OverlayScrollView.h	2015-10-20 18:34:31 +0000
@@ -21,6 +21,7 @@
 #define _UNITY_SCROLL_VIEW_H_
 
 #include <Nux/Nux.h>
+#include "PlacesOverlayVScrollBar.h"
 
 namespace unity
 {
@@ -33,6 +34,7 @@
   ScrollView(NUX_FILE_LINE_PROTO);
 
   nux::RWProperty<double> scale;
+  sigc::signal<void, ScrollDir> page_direction;
 
   using nux::ScrollView::SetVScrollBar;
 };
 
=== modified file 'unity-shared/OverlayWindowButtons.cpp'
--- unity-shared/OverlayWindowButtons.cpp	2014-02-26 20:26:01 +0000
+++ unity-shared/OverlayWindowButtons.cpp	2015-10-20 18:34:31 +0000
@@ -36,9 +36,9 @@
   : nux::BaseWindow("OverlayWindowButtons")
   , window_buttons_(new WindowButtons())
 {
-  window_buttons_->queue_draw.connect([this] (nux::Layout* /*layout*/) {
-    QueueDraw();
-  });
+  auto queue_draw = sigc::hide(sigc::mem_fun(this, &OverlayWindowButtons::QueueDraw));
+  window_buttons_->queue_draw.connect(queue_draw);
+  window_buttons_->child_queue_draw.connect(queue_draw);
 
   AddChild(window_buttons_.GetPointer());
   UpdateGeometry();
 
=== modified file 'unity-shared/PlacesOverlayVScrollBar.cpp'
--- unity-shared/PlacesOverlayVScrollBar.cpp	2014-08-06 14:12:12 +0000
+++ unity-shared/PlacesOverlayVScrollBar.cpp	2015-10-20 18:34:31 +0000
@@ -121,6 +121,11 @@
   animation_.SetFinishValue(stop);
 }
 
+void PlacesOverlayVScrollBar::PerformPageNavigation(ScrollDir dir)
+{
+  StartScrollAnimation(dir, _slider->GetBaseHeight());
+}
+
 void PlacesOverlayVScrollBar::StartScrollAnimation(ScrollDir dir, int stop)
 {
   if (animation_.CurrentState() == nux::animation::Animation::State::Stopped)
 
=== modified file 'unity-shared/PlacesOverlayVScrollBar.h'
--- unity-shared/PlacesOverlayVScrollBar.h	2014-08-06 14:12:12 +0000
+++ unity-shared/PlacesOverlayVScrollBar.h	2015-10-20 18:34:31 +0000
@@ -34,22 +34,24 @@
 namespace dash
 {
 
+enum class ScrollDir : unsigned int
+{
+  UP,
+  DOWN,
+};
+
 class PlacesOverlayVScrollBar: public PlacesVScrollBar
 {
 public:
   PlacesOverlayVScrollBar(NUX_FILE_LINE_PROTO);
   virtual ~PlacesOverlayVScrollBar() {}
 
+  void PerformPageNavigation(ScrollDir dir);
+
 protected:
   void Draw(nux::GraphicsEngine& graphics_engine, bool force_draw);
 
 private:
-  enum class ScrollDir : unsigned int
-  {
-    UP,
-    DOWN,
-  };
-
   void OnTrackGeometryChanged(nux::Area* area, nux::Geometry& geo);
   void OnVisibilityChanged(nux::Area* area, bool visible);
   void OnSensitivityChanged(nux::Area* area, bool sensitive);
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2014-12-16 19:27:36 +0000
+++ unity-shared/PluginAdapter.cpp	2015-10-20 18:34:31 +0000
@@ -627,7 +627,7 @@
     if (window->defaultViewport() == screen_vp &&
         window->isViewable() && window->isMapped() &&
         !window->minimized() && !window->inShowDesktopMode() &&
-        !(window->state() & CompWindowStateAboveMask) &&
+        !((window->state() & CompWindowStateAboveMask) && !window->focused()) &&
         !(window->type() & CompWindowTypeSplashMask) &&
         !(window->type() & CompWindowTypeDockMask) &&
         !window->overrideRedirect() &&
@@ -772,7 +772,10 @@
 {
   CompWindow* window = m_Screen->findWindow(window_id);
   if (window && (window->actions() & CompWindowActionMinimizeMask))
+  {
     window->unminimize();
+    window->show();
+  }
 }
 
 void PluginAdapter::Shade(Window window_id)
@@ -953,6 +956,7 @@
       if (forced_unminimize)
         {
           top_window->unminimize();
+          top_window->show();
         }
 
       top_window->raise();
 
=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2014-12-15 19:06:58 +0000
+++ unity-shared/SearchBar.cpp	2015-10-20 18:34:31 +0000
@@ -141,6 +141,9 @@
   : View(NUX_FILE_LINE_PARAM)
   , showing_filters(false)
   , can_refine_search(false)
+  , im_active([this] { return pango_entry_->im_active(); })
+  , im_preedit([this] { return pango_entry_->im_preedit(); })
+  , in_live_search([this] { return live_search_timeout_ && live_search_timeout_->IsRunning(); })
   , live_search_wait(DEFAULT_LIVE_SEARCH_TIMEOUT)
   , scale(DEFAULT_SCALE)
   , show_filter_hint_(show_filter_hint)
@@ -179,11 +182,11 @@
   pango_entry_->mouse_down.connect(sigc::mem_fun(this, &SearchBar::OnMouseButtonDown));
   pango_entry_->end_key_focus.connect(sigc::mem_fun(this, &SearchBar::OnEndKeyFocus));
   pango_entry_->key_up.connect([this] (unsigned int, unsigned long, unsigned long) {
-      if (get_im_preedit())
-      {
-        hint_->SetVisible(false);
-        hint_->QueueDraw();
-      }
+    if (im_preedit())
+    {
+      hint_->SetVisible(false);
+      hint_->QueueDraw();
+    }
   });
 
   layered_layout_ = new nux::LayeredLayout();
@@ -263,10 +266,8 @@
   OnFontChanged();
 
   search_hint.changed.connect([this](std::string const& s) { OnSearchHintChanged(); });
-  search_string.SetGetterFunction(sigc::mem_fun(this, &SearchBar::get_search_string));
+  search_string.SetGetterFunction([this] { return pango_entry_->GetText(); });
   search_string.SetSetterFunction(sigc::mem_fun(this, &SearchBar::set_search_string));
-  im_active.SetGetterFunction(sigc::mem_fun(this, &SearchBar::get_im_active));
-  im_preedit.SetGetterFunction(sigc::mem_fun(this, &SearchBar::get_im_preedit));
   showing_filters.changed.connect(sigc::mem_fun(this, &SearchBar::OnShowingFiltersChanged));
   scale.changed.connect(sigc::mem_fun(this, &SearchBar::UpdateScale));
   Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &SearchBar::UpdateSearchBarSize)));
@@ -633,11 +634,6 @@
   return expander_view_;
 }
 
-std::string SearchBar::get_search_string() const
-{
-  return pango_entry_->GetText();
-}
-
 bool SearchBar::set_search_string(std::string const& string)
 {
   pango_entry_->SetText(string.c_str());
@@ -649,16 +645,6 @@
   return true;
 }
 
-bool SearchBar::get_im_active() const
-{
-  return pango_entry_->im_active();
-}
-
-bool SearchBar::get_im_preedit() const
-{
-  return pango_entry_->im_preedit();
-}
-
 //
 // Highlight
 //
 
=== modified file 'unity-shared/SearchBar.h'
--- unity-shared/SearchBar.h	2014-12-08 22:02:13 +0000
+++ unity-shared/SearchBar.h	2015-10-20 18:34:31 +0000
@@ -63,6 +63,7 @@
   nux::Property<bool> can_refine_search;
   nux::ROProperty<bool> im_active;
   nux::ROProperty<bool> im_preedit;
+  nux::ROProperty<bool> in_live_search;
   nux::Property<unsigned> live_search_wait;
   nux::Property<double> scale;
 
@@ -88,10 +89,7 @@
   bool OnLiveSearchTimeout();
   bool OnSpinnerStartCb();
 
-  std::string get_search_string() const;
   bool set_search_string(std::string const& string);
-  bool get_im_active() const;
-  bool get_im_preedit() const;
   bool show_filter_hint_;
 
   std::string GetName() const;
 
=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2015-03-12 00:57:05 +0000
+++ unity-shared/UnitySettings.cpp	2015-10-20 18:34:31 +0000
@@ -371,7 +371,12 @@
 
 void Settings::SetLowGfxMode(const bool low_gfx)
 {
-  pimpl->lowGfx_ = low_gfx;
+  if (pimpl->lowGfx_ != low_gfx)
+  {
+    pimpl->lowGfx_ = low_gfx;
+
+    low_gfx_changed.emit();
+  }
 }
 
 EMConverter::Ptr const& Settings::em(int monitor) const
 
=== modified file 'unity-shared/UnitySettings.h'
--- unity-shared/UnitySettings.h	2014-03-20 05:03:55 +0000
+++ unity-shared/UnitySettings.h	2015-10-20 18:34:31 +0000
@@ -57,6 +57,7 @@
   nux::Property<double> font_scaling;
 
   sigc::signal<void> dpi_changed;
+  sigc::signal<void> low_gfx_changed;
 
 private:
   class Impl;
 
=== modified file 'unity-shared/WindowButtons.cpp'
--- unity-shared/WindowButtons.cpp	2014-02-28 17:41:25 +0000
+++ unity-shared/WindowButtons.cpp	2015-10-20 18:34:31 +0000
@@ -64,6 +64,7 @@
   if (new_state != visual_state_)
   {
     visual_state_ = new_state;
+    visual_state_change.emit(this);
     QueueDraw();
   }
 }