Merge lp:~gordallott/unity/lock-out-hud into lp:unity

[Gord Allott]

Changes the behaviour of the HUD/Launcher interaction in HideMode: Never

= The Problem =
See: https://bugs.launchpad.net/ayatana-design/+bug/921506

= The Fix =
Modify the Launcher to accept a new LauncherIcon that will listen to a UBUS message dictating its icon

= Testing =
Manual test included, lock-out behaviour is not included in out AP tests so ensuring a valid AP test seems non trivial at this point, requires an AP test module that can modify compiz options

[Tim Penhey (thumper)]

Actually adding an autopilot test for this is trivial.

What we can do is to run the HUD AP tests with the launcher in each state, locked out and auto-hide. We already do something like this for launchers for each monitor. I'll tackle the HUD tests with thomi tomorrow.

[Didier Roche-Tolomelli (didrocks)]

we want that for this release isn't it? can someone review it and merge it with the manual test if anyone has the AP test for it?

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

This has some conflicts with trunk, also you're using some lambda functions to connect to sigc::signal's, but in that case you need to disconnect from them in destructor or use a sigc::mem_fun instead (this doesn't apply to the ubus callback functions, of course).

Plus, I'm not sure if that's wanted, but if enabling the launcher's audohide feature, when closing the HUD, the launcher reveals and then closes again.

42 + if (!g_strcmp0(overlay_identity, "hud"))

Why not using overlay_identity.Str() == "hud" ?

 launcher_width.changed.connect([this] (int new_width) { Relayout(); });

I guess you can just pass [&] and please follow what said above. Even if the hud view shouldn't be destroyed, I guess it's better to stay safe.

review: Needs Fixing

[Tim Penhey (thumper)]

As well as the launcher popping out when you close the hud, if you do the following:
  press Alt
  press Super

You get the dash with a hidden launcher.

Also, you get a peaking icon when you start the hud with a hidden launcher.

I'm fixing these now. I have a branch that fixes everything so far except making sure the icon saturation is right at the right time.

[Tim Penhey (thumper)]

Also worth noting I guess, this branch doesn't fix the bug around the icon size for the hud when you don't have a fixed launcher.

=== modified file 'manual-tests/Hud.txt'
--- manual-tests/Hud.txt	2012-02-12 18:23:18 +0000
+++ manual-tests/Hud.txt	2012-03-16 10:27:23 +0000
@@ -56,3 +56,16 @@
   After pressing escape in step three, the text "test" should be removed from the hud search
   After step four, the hud should dismiss itself and not be present.
 
+
+Hud Reveal Behaviour
+---------
+This test ensures that the hud behaves correctly with a locked out launcher
+
+#. Ensure the launchers hide mode is set to "Never"
+#. Tap Alt
+
+Outcome
+  The Launcher should stick be locked out.
+  The Launcher icons should be desaturated.
+  The top most Launcher icon should be an icon related the the focused window
+  The BFB should not be present

=== modified file 'plugins/unityshell/src/BFBLauncherIcon.cpp'
--- plugins/unityshell/src/BFBLauncherIcon.cpp	2012-02-22 08:53:20 +0000
+++ plugins/unityshell/src/BFBLauncherIcon.cpp	2012-03-16 10:27:23 +0000
@@ -45,6 +45,25 @@
   background_color_ = nux::color::White;
 
   mouse_enter.connect([&](int m) { ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL); });
+  ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, sigc::bind(sigc::mem_fun(this, &BFBLauncherIcon::OnOverlayShown), true));
+  ubus_manager_.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::bind(sigc::mem_fun(this, &BFBLauncherIcon::OnOverlayShown), false));
+}
+
+void BFBLauncherIcon::OnOverlayShown(GVariant *data, bool visible)
+{
+  unity::glib::String overlay_identity;
+  gboolean can_maximise = FALSE;
+  gint32 overlay_monitor = 0;
+  g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
+                &overlay_identity, &can_maximise, &overlay_monitor);
+
+
+  if (!g_strcmp0(overlay_identity, "hud"))
+  {
+    // if the hud is open, we hide the BFB
+    SetQuirk(QUIRK_VISIBLE, !visible);
+    EmitNeedsRedraw();
+  }
 }
 
 nux::Color BFBLauncherIcon::BackgroundColor()

=== modified file 'plugins/unityshell/src/BFBLauncherIcon.h'
--- plugins/unityshell/src/BFBLauncherIcon.h	2012-02-22 08:53:20 +0000
+++ plugins/unityshell/src/BFBLauncherIcon.h	2012-03-16 10:27:23 +0000
@@ -47,6 +47,7 @@
   std::string GetName() const;
 
 private:
+  void OnOverlayShown(GVariant *data, bool visible);
   static void OnMenuitemActivated(DbusmenuMenuitem* item, int time, gchar* lens);
 
   static unity::UBusManager ubus_manager_;

=== modified file 'plugins/unityshell/src/HudController.cpp'
--- plugins/unityshell/src/HudController.cpp	2012-03-09 15:38:35 +0000
+++ plugins/unityshell/src/HudController.cpp	2012-03-16 10:27:23 +0000
@@ -39,7 +39,7 @@
 }
 
 Controller::Controller()
-  : launcher_width(66)
+  : launcher_width(65)
   , hud_service_("com.canonical.hud", "/com/canonical/hud")
   , window_(nullptr)
   , visible_(false)
@@ -47,6 +47,7 @@
   , timeline_id_(0)
   , last_opacity_(0.0f)
   , start_time_(0)
+  , launcher_is_locked_out_(false)
   , view_(nullptr)
 {
   LOG_DEBUG(logger) << "hud startup";
@@ -69,6 +70,8 @@
     }
   });
 
+  launcher_width.changed.connect([this] (int new_width) { Relayout(); });
+
   PluginAdapter::Default()->compiz_screen_ungrabbed.connect(sigc::mem_fun(this, &Controller::OnScreenUngrabbed));
 
   hud_service_.queries_updated.connect(sigc::mem_fun(this, &Controller::OnQueriesFinished));
@@ -154,17 +157,23 @@
 
 nux::Geometry Controller::GetIdealWindowGeometry()
 {
-   UScreen *uscreen = UScreen::GetDefault();
-   int primary_monitor = uscreen->GetMonitorWithMouse();
-   auto monitor_geo = uscreen->GetMonitorGeometry(primary_monitor);
+  UScreen *uscreen = UScreen::GetDefault();
+  int primary_monitor = uscreen->GetMonitorWithMouse();
+  auto monitor_geo = uscreen->GetMonitorGeometry(primary_monitor);
 
-   // We want to cover as much of the screen as possible to grab any mouse events outside
-   // of our window
-   panel::Style &panel_style = panel::Style::Instance();
-   return nux::Geometry (monitor_geo.x,
-                         monitor_geo.y + panel_style.panel_height,
-                         monitor_geo.width,
-                         monitor_geo.height - panel_style.panel_height);
+  // We want to cover as much of the screen as possible to grab any mouse events outside
+  // of our window
+  panel::Style &panel_style = panel::Style::Instance();
+  nux::Geometry geo(monitor_geo.x,
+                       monitor_geo.y + panel_style.panel_height,
+                       monitor_geo.width,
+                       monitor_geo.height - panel_style.panel_height);
+  if (launcher_is_locked_out_)
+  {
+    geo.x += launcher_width;
+    geo.width -= launcher_width;
+  }
+  return geo;
 }
 
 void Controller::Relayout(GdkScreen*screen)
@@ -224,6 +233,16 @@
   return visible_;
 }
 
+void Controller::SetLauncherIsLockedOut(bool launcher_is_locked_out)
+{
+  launcher_is_locked_out_ = launcher_is_locked_out;
+  if (launcher_is_locked_out_)
+    view_->SetHideIcon(IconHideState::HIDE);
+  else
+    view_->SetHideIcon(IconHideState::SHOW);
+  Relayout();
+}
+
 void Controller::ShowHud()
 {
   PluginAdapter* adaptor = PluginAdapter::Default();
@@ -248,6 +267,7 @@
   focused_app_icon_ = view_icon.Str();
 
   LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
+  ubus.SendMessage(UBUS_HUD_ICON_CHANGED, g_variant_new_string(focused_app_icon_.c_str())); 
   view_->SetIcon(focused_app_icon_);
 
   window_->ShowWindow(true);
@@ -398,6 +418,7 @@
 {
   LOG_DEBUG(logger) << "Selected query, " << query->formatted_text;
   view_->SetIcon(query->icon_name);
+  ubus.SendMessage(UBUS_HUD_ICON_CHANGED, g_variant_new_string(query->icon_name.c_str()));
 }
 
 
@@ -416,6 +437,7 @@
 
   LOG_DEBUG(logger) << "setting icon to - " << icon_name;
   view_->SetIcon(icon_name);
+  ubus.SendMessage(UBUS_HUD_ICON_CHANGED, g_variant_new_string(icon_name.c_str()));
 }
 
 // Introspectable

=== modified file 'plugins/unityshell/src/HudController.h'
--- plugins/unityshell/src/HudController.h	2012-02-12 14:47:39 +0000
+++ plugins/unityshell/src/HudController.h	2012-03-16 10:27:23 +0000
@@ -54,6 +54,8 @@
   void ShowHud();
   void HideHud(bool restore_focus = true);
   bool IsVisible();
+  void SetLauncherIsLockedOut(bool launcher_is_locked_out);
+
 protected:
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
@@ -99,6 +101,8 @@
   guint timeline_id_;
   float last_opacity_;
   gint64 start_time_;
+ 
+  bool launcher_is_locked_out_;
 
   View* view_;
   guint ensure_id_;

=== added file 'plugins/unityshell/src/HudLauncherIcon.cpp'
--- plugins/unityshell/src/HudLauncherIcon.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/HudLauncherIcon.cpp	2012-03-16 10:27:23 +0000
@@ -0,0 +1,115 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2011 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: Gordon Allott <[e-mail]> 
+ */
+
+#include "HudLauncherIcon.h"
+#include "Launcher.h"
+#include "UnityCore/GLibWrapper.h"
+#include <NuxCore/Logger.h>
+
+#include "UBusMessages.h"
+
+#include <glib/gi18n-lib.h>
+
+namespace unity
+{
+namespace launcher
+{
+
+namespace
+{
+nux::logging::Logger logger("unity.launcher.hudlaunchericon");
+}
+
+UBusManager HudLauncherIcon::ubus_manager_;
+
+HudLauncherIcon::HudLauncherIcon()
+ : SimpleLauncherIcon()
+{
+  tooltip_text = _("HUD");
+  icon_name = PKGDATADIR"/launcher_bfb.png";
+  SetQuirk(QUIRK_VISIBLE, false);
+  SetQuirk(QUIRK_RUNNING, false);
+  SetQuirk(QUIRK_ACTIVE, true);
+  SetIconType(TYPE_HOME);
+
+  background_color_ = nux::color::White;
+
+  ubus_manager_.RegisterInterest(UBUS_HUD_ICON_CHANGED, [&](GVariant *data)
+  {
+    LOG_DEBUG(logger) << "Hud icon change: " << g_variant_get_string(data, NULL);
+    glib::String hud_icon_name(g_strdup(g_variant_get_string(data, NULL)));
+    if (!hud_icon_name.Str().empty()
+        && hud_icon_name.Str() != icon_name())
+    {
+      icon_name = hud_icon_name.Str();
+      EmitNeedsRedraw();
+    }
+  });
+
+  ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, sigc::bind(sigc::mem_fun(this, &HudLauncherIcon::OnOverlayShown), true));
+  ubus_manager_.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::bind(sigc::mem_fun(this, &HudLauncherIcon::OnOverlayShown), false));
+
+  mouse_enter.connect([&](int m) { ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL); });
+}
+
+void HudLauncherIcon::OnOverlayShown(GVariant *data, bool visible)
+{
+  unity::glib::String overlay_identity;
+  gboolean can_maximise = FALSE;
+  gint32 overlay_monitor = 0;
+  g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
+                &overlay_identity, &can_maximise, &overlay_monitor);
+
+
+  if (!g_strcmp0(overlay_identity, "hud"))
+  {
+    SetQuirk(QUIRK_VISIBLE, visible);
+    EmitNeedsRedraw();
+  }
+}
+
+nux::Color HudLauncherIcon::BackgroundColor()
+{
+  return background_color_;
+}
+
+nux::Color HudLauncherIcon::GlowColor()
+{
+  return background_color_;
+}
+
+void HudLauncherIcon::ActivateLauncherIcon(ActionArg arg)
+{
+  // wut? activate? noo we don't do that.
+}
+
+std::list<DbusmenuMenuitem*> HudLauncherIcon::GetMenus()
+{
+  std::list<DbusmenuMenuitem*> result;
+  return result;
+}
+
+std::string HudLauncherIcon::GetName() const
+{
+  return "HudLauncherIcon";
+}
+
+} // namespace launcher
+} // namespace unity
+

=== added file 'plugins/unityshell/src/HudLauncherIcon.h'
--- plugins/unityshell/src/HudLauncherIcon.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/HudLauncherIcon.h	2012-03-16 10:27:23 +0000
@@ -0,0 +1,56 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2011 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: Gordon Allott <[e-mail]>
+ */
+
+#ifndef UNITYSHELL_HUDLAUNCHERICON_H
+#define UNITYSHELL_HUDLAUNCHERICON_H
+
+#include "SimpleLauncherIcon.h"
+#include "UBusWrapper.h"
+
+namespace unity
+{
+namespace launcher
+{
+
+class HudLauncherIcon : public SimpleLauncherIcon
+{
+
+public:
+  HudLauncherIcon();
+
+  virtual nux::Color BackgroundColor();
+  virtual nux::Color GlowColor();
+
+  void ActivateLauncherIcon(ActionArg arg);
+
+protected:
+  std::list<DbusmenuMenuitem*> GetMenus();
+  std::string GetName() const;
+
+private:
+  void OnOverlayShown(GVariant *data, bool visible);
+
+  static unity::UBusManager ubus_manager_;
+  nux::Color background_color_;
+};
+
+}
+}
+
+#endif // UNITYSHELL_HUDLAUNCHERICON_H

=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-03-02 02:00:18 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-03-16 10:27:23 +0000
@@ -64,6 +64,7 @@
   , current_height_(0)
   , timeline_need_more_draw_(false)
   , selected_button_(0)
+  , icon_state_(IconHideState::SHOW)
 {
   renderer_.SetOwner(this);
   renderer_.need_redraw.connect([this] () { 
@@ -185,7 +186,6 @@
   layout_->SetMinimumWidth(content_geo_.width);
   layout_->SetMaximumWidth(content_geo_.width);
   layout_->SetMaximumHeight(content_geo_.height);
-  //layout_->SetMinMaxSize(content_geo_.width, content_geo_.height);
 
   QueueDraw();
 }
@@ -274,6 +274,22 @@
   QueueDraw();
 }
 
+void View::SetHideIcon(IconHideState hide_icon)
+{
+  LOG_DEBUG(logger) << "Hide icon called";
+  if (hide_icon == icon_state_)
+    return;
+
+  icon_state_ = hide_icon;
+
+  if (icon_state_ == IconHideState::HIDE)
+    layout_->RemoveChildObject(dynamic_cast<nux::Area*>(icon_layout_.GetPointer()));
+  else
+    layout_->AddLayout(icon_layout_.GetPointer(), 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_MATCHCONTENT, 100.0f, nux::LayoutPosition::NUX_LAYOUT_BEGIN);
+
+  Relayout();
+}
+
 // Gives us the width and height of the contents that will give us the best "fit",
 // which means that the icons/views will not have uneccessary padding, everything will
 // look tight
@@ -284,7 +300,12 @@
   int width, height = 0;
   width = 1024;
   height = 276;
-  
+
+  if (icon_state_ == IconHideState::HIDE)
+  {
+    width -= icon_layout_->GetGeometry().width;
+  }
+
   LOG_DEBUG (logger) << "best fit is, " << width << ", " << height;
 
   return nux::Geometry(0, 0, width, height);
@@ -324,11 +345,11 @@
   { 
     // fill icon layout with icon
     icon_ = new Icon("", icon_size, true);
-    nux::Layout* icon_layout = new nux::VLayout();
+    icon_layout_ = new nux::VLayout();
     {
-      icon_layout->SetVerticalExternalMargin(icon_vertical_margin);
-      icon_layout->AddView(icon_.GetPointer(), 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
-      layout_->AddLayout(icon_layout, 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_MATCHCONTENT);
+      icon_layout_->SetVerticalExternalMargin(icon_vertical_margin);
+      icon_layout_->AddView(icon_.GetPointer(), 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+      layout_->AddLayout(icon_layout_.GetPointer(), 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_MATCHCONTENT);
     }
 
     // add padding to layout between icon and content

=== modified file 'plugins/unityshell/src/HudView.h'
--- plugins/unityshell/src/HudView.h	2012-03-02 02:00:18 +0000
+++ plugins/unityshell/src/HudView.h	2012-03-16 10:27:23 +0000
@@ -44,6 +44,12 @@
 namespace hud
 {
 
+enum IconHideState
+{
+  HIDE,
+  SHOW
+};
+
 class View : public nux::View, public unity::debug::Introspectable
 {
   NUX_DECLARE_OBJECT_TYPE(HudView, nux::View);
@@ -59,7 +65,8 @@
 
   void SetQueries(Hud::Queries queries);
   void SetIcon(std::string icon_name);
-  
+  void SetHideIcon(IconHideState hide_icon);
+
   void AboutToShow();
   void AboutToHide();
 
@@ -104,6 +111,7 @@
   //FIXME - replace with dash search bar once modifications to dash search bar land
   SearchBar::Ptr search_bar_;
   Icon::Ptr icon_;
+  nux::ObjectPtr<nux::Layout> icon_layout_;
   bool visible_;
 
   Hud::Queries queries_;
@@ -118,6 +126,7 @@
   int current_height_;
   bool timeline_need_more_draw_;
   int selected_button_;
+  IconHideState icon_state_;
 };
 
 

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-03-13 17:20:30 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-03-16 10:27:23 +0000
@@ -1320,19 +1320,16 @@
                 &overlay_identity, &can_maximise, &overlay_monitor);
 
 
-  if (!g_strcmp0(overlay_identity, "dash"))
+  if (overlay_monitor == monitor)
   {
-    if (overlay_monitor == monitor)
-    {
-      LauncherModel::iterator it;
-
-      _dash_is_open = true;
-      bg_effect_helper_.enabled = true;
-      _hide_machine->SetQuirk(LauncherHideMachine::PLACES_VISIBLE, true);
-      _hover_machine->SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, true);
-
-      DesaturateIcons();
-    }
+    LauncherModel::iterator it;
+
+    _dash_is_open = true;
+    bg_effect_helper_.enabled = true;
+    _hide_machine->SetQuirk(LauncherHideMachine::PLACES_VISIBLE, true);
+    _hover_machine->SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, true);
+
+    DesaturateIcons();
   }
 }
 
@@ -1345,26 +1342,23 @@
   g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
                 &overlay_identity, &can_maximise, &overlay_monitor);
 
-  if (!g_strcmp0(overlay_identity, "dash"))
-  {
-    if (!_dash_is_open)
-      return;
-
-    LauncherModel::iterator it;
-
-    _dash_is_open = false;
-    bg_effect_helper_.enabled = false;
-    _hide_machine->SetQuirk(LauncherHideMachine::PLACES_VISIBLE, false);
-    _hover_machine->SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, false);
-
-    // as the leave event is no more received when the place is opened
-    // FIXME: remove when we change the mouse grab strategy in nux
-    nux::Point pt = nux::GetWindowCompositor().GetMousePosition();
-
-    SetStateMouseOverLauncher(GetAbsoluteGeometry().IsInside(pt));
-
-    SaturateIcons();
-  }
+  if (!_dash_is_open)
+    return;
+
+  LauncherModel::iterator it;
+
+  _dash_is_open = false;
+  bg_effect_helper_.enabled = false;
+  _hide_machine->SetQuirk(LauncherHideMachine::PLACES_VISIBLE, false);
+  _hover_machine->SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, false);
+
+  // as the leave event is no more received when the place is opened
+  // FIXME: remove when we change the mouse grab strategy in nux
+  nux::Point pt = nux::GetWindowCompositor().GetMousePosition();
+
+  SetStateMouseOverLauncher(GetAbsoluteGeometry().IsInside(pt));
+
+  SaturateIcons();
 }
 
 void Launcher::OnActionDone(GVariant* data)

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-03-14 23:22:02 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-03-16 10:27:23 +0000
@@ -32,6 +32,7 @@
 #include "DeviceLauncherIcon.h"
 #include "DeviceLauncherSection.h"
 #include "FavoriteStore.h"
+#include "HudLauncherIcon.h"
 #include "Launcher.h"
 #include "LauncherController.h"
 #include "LauncherEntryRemote.h"
@@ -233,6 +234,7 @@
   FavoriteStore::GetDefault().reordered.connect(sigc::mem_fun(this, &Impl::OnFavoriteStoreReordered));
 
   RegisterIcon(AbstractLauncherIcon::Ptr(new BFBLauncherIcon()));
+  RegisterIcon(AbstractLauncherIcon::Ptr(new HudLauncherIcon()));
   desktop_icon_ = AbstractLauncherIcon::Ptr(new DesktopLauncherIcon());
 
   uscreen->changed.connect(sigc::mem_fun(this, &Controller::Impl::OnScreenChanged));

=== modified file 'plugins/unityshell/src/LauncherHideMachine.cpp'
--- plugins/unityshell/src/LauncherHideMachine.cpp	2012-02-08 16:43:47 +0000
+++ plugins/unityshell/src/LauncherHideMachine.cpp	2012-03-16 10:27:23 +0000
@@ -134,19 +134,19 @@
 {
   bool should_hide;
 
-  // early check to see if we are locking to hidden
+  if (_mode == HIDE_NEVER)
+  {
+    SetShouldHide(false, skip_delay);
+    return;
+  }
+  
+  // early check to see if we are locking to hidden - but only if we are in non HIDE_NEVER
   if (GetQuirk(LOCK_HIDE))
   {
     SetShouldHide(true, true);
     return;
   }
 
-  if (_mode == HIDE_NEVER)
-  {
-    SetShouldHide(false, skip_delay);
-    return;
-  }
-
   do
   {
     // first we check the condition where external DND is active and the push off has happened

=== modified file 'plugins/unityshell/src/UBusMessages.h'
--- plugins/unityshell/src/UBusMessages.h	2012-02-07 07:42:12 +0000
+++ plugins/unityshell/src/UBusMessages.h	2012-03-16 10:27:23 +0000
@@ -64,6 +64,9 @@
 // Signal to force the launcher into locked mode, (b)
 #define UBUS_LAUNCHER_LOCK_HIDE "LAUNCHER_LOCK_HIDE"
 
+// Signal to emit changes to the launcher hide mode behaviour (b), true = locked out, false = unlocked
+#define UBUS_LAUNCHER_HIDE_MODE_CHANGE "LAUNCHER_HIDE_MODE_CHANGE"
+
 // Signal sent when a quicklist is shown.
 #define UBUS_QUICKLIST_SHOWN "QUICKLIST_SHOWN"
 
@@ -78,6 +81,8 @@
 // FIXME - fix the nux focus api so we don't need this
 #define UBUS_RESULT_VIEW_KEYNAV_CHANGED "RESULT_VIEW_KEYNAV_CHANGED"
 
+// Sends a string datatype containing the new icon name
+#define UBUS_HUD_ICON_CHANGED "HUD_ICON_CHANGED"
 #define UBUS_HUD_CLOSE_REQUEST "HUD_CLOSE_REQUEST"
 
 // Signals sent when the switcher is shown, hidden or changes selection

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-03-14 13:05:59 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-03-16 10:27:23 +0000
@@ -2505,8 +2505,11 @@
       break;
     }
     case UnityshellOptions::LauncherHideMode:
+    {
       launcher_options->hide_mode = (unity::launcher::LauncherHideMode) optionGetLauncherHideMode();
+      hud_controller_->SetLauncherIsLockedOut(launcher_options->hide_mode == unity::launcher::LauncherHideMode::LAUNCHER_HIDE_NEVER);
       break;
+    }
     case UnityshellOptions::BacklightMode:
       launcher_options->backlight_mode = (unity::launcher::BacklightMode) optionGetBacklightMode();
       break;
@@ -2738,6 +2741,8 @@
 
   /* Setup Hud */
   hud_controller_.reset(new hud::Controller());
+  auto hide_mode = (unity::launcher::LauncherHideMode) optionGetLauncherHideMode();
+  hud_controller_->SetLauncherIsLockedOut(hide_mode == unity::launcher::LauncherHideMode::LAUNCHER_HIDE_NEVER);
   AddChild(hud_controller_.get());
   LOG_INFO(logger) << "initLauncher-hud " << timer.ElapsedSeconds() << "s";