Merge lp:~3v1n0/unity/lim-visibility-fixes into lp:unity

[Marco Trevisan (Treviño)]

MenuManager: make sure menus are always shown when mouse is over them or when the always-show-menus option is on

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3899
http://jenkins.qa.ubuntu.com/job/unity-ci/1128/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/15/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3899
http://jenkins.qa.ubuntu.com/job/unity-ci/1131/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/18/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3899
http://jenkins.qa.ubuntu.com/job/unity-ci/1132/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/19/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3899
http://jenkins.qa.ubuntu.com/job/unity-ci/1135/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/22/console

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

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

Builds OK (thanks for nothing, Jenkins).

Will do more rigourous testing from the landing silo.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3900
http://jenkins.qa.ubuntu.com/job/unity-ci/1136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/23

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok

review: Approve

[Christopher Townsend (townsend)]

lol, I meant to approve the SRU branch. My Firefox tabs got me confused:)

=== modified file 'UnityCore/AppmenuIndicator.cpp'
--- UnityCore/AppmenuIndicator.cpp	2012-12-04 00:33:18 +0000
+++ UnityCore/AppmenuIndicator.cpp	2015-01-15 14:44:53 +0000
@@ -17,6 +17,7 @@
  * Authored by: Marco Trevisan (Treviño) <[e-mail]>
  */
 
+#include "GLibSource.h"
 #include "AppmenuIndicator.h"
 
 namespace unity
@@ -24,8 +25,31 @@
 namespace indicator
 {
 
+struct AppmenuIndicator::Impl
+{
+  Impl(AppmenuIndicator* parent)
+  {
+    // When the active window has changed we might need to emit an updated signal
+    parent->active_window.changed.connect([this, parent] (unsigned long) {
+      update_wait_.reset(new glib::Timeout(250, [parent] {
+        parent->updated.emit();
+        return false;
+      }));
+    });
+
+    parent->updated.connect([this] { update_wait_.reset(); });
+  }
+
+  glib::Source::UniquePtr update_wait_;
+};
+
 AppmenuIndicator::AppmenuIndicator(std::string const& name)
   : Indicator(name)
+  , active_window(0)
+  , impl_(new AppmenuIndicator::Impl(this))
+{}
+
+AppmenuIndicator::~AppmenuIndicator()
 {}
 
 void AppmenuIndicator::ShowAppmenu(unsigned int xid, int x, int y) const
 
=== modified file 'UnityCore/AppmenuIndicator.h'
--- UnityCore/AppmenuIndicator.h	2014-02-12 00:51:09 +0000
+++ UnityCore/AppmenuIndicator.h	2015-01-15 14:44:53 +0000
@@ -20,6 +20,7 @@
 #ifndef UNITY_APPMENU_INDICATOR_H
 #define UNITY_APPMENU_INDICATOR_H
 
+#include <NuxCore/Property.h>
 #include "Indicator.h"
 
 namespace unity
@@ -33,12 +34,19 @@
   typedef std::shared_ptr<AppmenuIndicator> Ptr;
 
   AppmenuIndicator(std::string const& name);
+  ~AppmenuIndicator();
+
+  nux::Property<unsigned> active_window;
 
   virtual bool IsAppmenu() const { return true; }
 
   void ShowAppmenu(unsigned xid, int x, int y) const;
 
   sigc::signal<void, unsigned, int, int> on_show_appmenu;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> impl_;
 };
 
 }
 
=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2014-09-10 12:48:03 +0000
+++ com.canonical.Unity.gschema.xml	2015-01-15 14:44:53 +0000
@@ -53,6 +53,14 @@
         on the window decoration, otherwise they will be always shown on the
         unity top panel</description>
     </key>
+    <key type="b" name="always-show-menus">
+      <default>false</default>
+      <summary>Toggle the menu visibility based on mouse hovering.</summary>
+      <description>When this is enabled, the application menus will be always
+        shown (on the window decoration or in the unity panel, depending whether
+        integrated menus are enabled), otherwise they will be shown only when
+        the mouse cursor is over the relative mouse area.</description>
+    </key>
   </schema>
   <schema path="/com/canonical/unity/interface/" id="com.canonical.Unity.Interface" gettext-domain="unity">
     <key type="d" name="text-scale-factor">
 
=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2014-11-28 12:55:13 +0000
+++ decorations/DecoratedWindow.cpp	2015-01-15 14:44:53 +0000
@@ -708,16 +708,14 @@
   auto const& sliding_layout = sliding_layout_.lock();
   sliding_layout->SetInputItem(nullptr);
   sliding_layout->mouse_owner = false;
+  sliding_layout->override_main_item = false;
+  grab_mouse_changed_->disconnect();
 
-  if (!menu_manager->HasAppMenu() || !Style::Get()->integrated_menus())
+  if (!menu_manager->HasAppMenu() || !menu_manager->integrated_menus())
     return;
 
-  auto visibility_cb = sigc::hide(sigc::mem_fun(this, &Impl::UpdateAppMenuVisibility));
   auto menus = std::make_shared<MenuLayout>(menu_manager, win_);
   menus->Setup();
-  menus->active.changed.connect(visibility_cb);
-  menus->show_now.changed.connect(visibility_cb);
-  menus->mouse_owner.changed.connect(visibility_cb);
   menus_ = menus;
 
   auto const& grab_edge = grab_edge_.lock();
@@ -725,15 +723,27 @@
   sliding_layout->fadein = menu_manager->fadein();
   sliding_layout->fadeout = menu_manager->fadeout();
 
-  if (grab_edge->mouse_owner() || grab_edge->Geometry().contains(CompPoint(pointerX, pointerY)))
-    sliding_layout->mouse_owner = true;
-
-  grab_mouse_changed_ = grab_edge->mouse_owner.changed.connect([this] (bool owner) {
-    sliding_layout_->mouse_owner = owner;
-  });
-
-  if (sliding_layout->mouse_owner())
-    input_mixer_->ForceMouseOwnerCheck();
+  if (menu_manager->always_show_menus())
+  {
+    sliding_layout->override_main_item = true;
+  }
+  else
+  {
+    auto visibility_cb = sigc::hide(sigc::mem_fun(this, &Impl::UpdateAppMenuVisibility));
+    menus->active.changed.connect(visibility_cb);
+    menus->show_now.changed.connect(visibility_cb);
+    menus->mouse_owner.changed.connect(visibility_cb);
+
+    if (grab_edge->mouse_owner() || grab_edge->Geometry().contains(CompPoint(pointerX, pointerY)))
+      sliding_layout->mouse_owner = true;
+
+    grab_mouse_changed_ = grab_edge->mouse_owner.changed.connect([this] (bool owner) {
+      sliding_layout_->mouse_owner = owner || menus_->show_now();
+    });
+
+    if (sliding_layout->mouse_owner())
+      input_mixer_->ForceMouseOwnerCheck();
+  }
 
   SyncMenusGeometries();
 }
 
=== modified file 'decorations/DecorationsForceQuitDialog.cpp'
--- decorations/DecorationsForceQuitDialog.cpp	2015-01-12 18:30:09 +0000
+++ decorations/DecorationsForceQuitDialog.cpp	2015-01-15 14:44:53 +0000
@@ -97,6 +97,20 @@
 static void close_button_init(CloseButton*);
 static void close_button_class_init(CloseButtonClass*);
 
+bool gdk_error_trap_pop_with_output(std::string const& prefix)
+{
+  if (int error_code = gdk_error_trap_pop())
+  {
+    gchar tmp[1024];
+    XGetErrorText(gdk_x11_get_default_xdisplay(), error_code, tmp, sizeof(tmp) - 1);
+    tmp[sizeof(tmp) - 1] = '\0';
+    LOG_ERROR(logger) << (prefix.empty() ? "X error: " : prefix+": ") << tmp;
+    return true;
+  }
+
+  return false;
+}
+
 // Window implementation
 GtkWidget* sheet_style_window_new(ForceQuitDialog* main_dialog, Window parent_xid)
 {
@@ -112,15 +126,20 @@
   gtk_window_set_deletable(self, FALSE);
   gtk_window_set_title(self, "Force Quit Dialog");
 
+  gdk_error_trap_push();
   XClassHint parent_class = {nullptr, nullptr};
   XGetClassHint(dpy, parent_xid, &parent_class);
-  gtk_window_set_wmclass(self, parent_class.res_name, parent_class.res_class);
+
+  if (!gdk_error_trap_pop_with_output("Impossible to get window class"))
+    gtk_window_set_wmclass(self, parent_class.res_name, parent_class.res_class);
+
   XFree(parent_class.res_class);
   XFree(parent_class.res_name);
 
   Atom WM_PID = gdk_x11_get_xatom_by_name("_NET_WM_PID");
   Atom WM_CLIENT_MACHINE = gdk_x11_get_xatom_by_name("WM_CLIENT_MACHINE");
 
+  gdk_error_trap_push();
   auto& wm = WindowManager::Default();
   auto parent_hostname = wm.GetStringProperty(parent_xid, WM_CLIENT_MACHINE);
   long parent_pid = 0;
@@ -139,6 +158,8 @@
     }
   }
 
+  gdk_error_trap_pop_with_output("Impossible to get window client machine and PID");
+
   auto const& deco_style = decoration::Style::Get();
   auto const& offset = deco_style->ShadowOffset();
   int max_offset = std::max(std::abs(offset.x * 4), std::abs(offset.y * 4));
@@ -162,14 +183,7 @@
   auto xid = gdk_x11_window_get_xid(gwindow);
   XSetTransientForHint(dpy, xid, parent_xid);
   XSync(dpy, False);
-
-  if (int error_code = gdk_error_trap_pop())
-  {
-    gchar tmp[1024];
-    XGetErrorText(dpy, error_code, tmp, sizeof(tmp) - 1);
-    tmp[sizeof(tmp) - 1] = '\0';
-    LOG_ERROR(logger) << "Impossible to reparent dialog: " << tmp;
-  }
+  gdk_error_trap_pop_with_output("Impossible to reparent dialog");
 
   XChangeProperty(dpy, xid, WM_CLIENT_MACHINE, XA_STRING, 8, PropModeReplace,
                   (unsigned char *) parent_hostname.c_str(), parent_hostname.size());
@@ -227,17 +241,9 @@
 
   gdk_error_trap_push();
   XSync(dpy, False);
-
-  if (int error_code = gdk_error_trap_pop())
-  {
-    gchar tmp[1024];
-    XGetErrorText(dpy, error_code, tmp, sizeof(tmp) - 1);
-    tmp[sizeof(tmp) - 1] = '\0';
-    LOG_ERROR(logger) << "Impossible to kill window " << parent_xid << ": " << tmp;
-  }
-
   XKillClient(dpy, parent_xid);
   XSync(dpy, False);
+  gdk_error_trap_pop_with_output("Impossible to kill window "+std::to_string(parent_xid));
 
   if (parent_pid > 0)
     kill(parent_pid, 9);
 
=== modified file 'decorations/DecorationsManager.cpp'
--- decorations/DecorationsManager.cpp	2014-10-22 14:38:06 +0000
+++ decorations/DecorationsManager.cpp	2015-01-15 14:44:53 +0000
@@ -58,7 +58,7 @@
   manager_->inactive_shadow_color.changed.connect(sigc::hide(sigc::bind(rebuild_cb, false)));
   manager_->inactive_shadow_radius.changed.connect(sigc::hide(sigc::bind(rebuild_cb, false)));
   manager_->shadow_offset.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::UpdateWindowsExtents)));
-  Style::Get()->integrated_menus.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::SetupIntegratedMenus)));
+  menu_manager_->integrated_menus.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::SetupIntegratedMenus)));
 
   BuildInactiveShadowTexture();
   BuildActiveShadowTexture();
@@ -110,7 +110,7 @@
 
 void Manager::Impl::SetupIntegratedMenus()
 {
-  if (!Style::Get()->integrated_menus())
+  if (!menu_manager_->integrated_menus())
   {
     UnsetAppMenu();
     menu_connections_.Clear();
@@ -120,6 +120,7 @@
   menu_connections_.Add(menu_manager_->appmenu_added.connect(sigc::mem_fun(this, &Impl::SetupAppMenu)));
   menu_connections_.Add(menu_manager_->appmenu_removed.connect(sigc::mem_fun(this, &Impl::UnsetAppMenu)));
   menu_connections_.Add(menu_manager_->key_activate_entry.connect(sigc::mem_fun(this, &Impl::OnMenuKeyActivated)));
+  menu_connections_.Add(menu_manager_->always_show_menus.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::SetupAppMenu))));
 
   SetupAppMenu();
 }
@@ -140,6 +141,8 @@
     return;
   }
 
+  appmenu->active_window = screen->activeWindow();
+
   auto setup_active_window = [this] {
     if (Window::Ptr const& active_win = active_deco_win_.lock())
       active_win->impl_->SetupAppMenu();
@@ -256,11 +259,15 @@
         if (active_deco_win_)
           active_deco_win_->impl_->active = false;
 
-        auto const& new_active = GetWindowByXid(screen->activeWindow());
+        auto active_xid = screen->activeWindow();
+        auto const& new_active = GetWindowByXid(active_xid);
         active_deco_win_ = new_active;
 
         if (new_active)
           new_active->impl_->active = true;
+
+        if (indicator::AppmenuIndicator::Ptr const& appmenu = menu_manager_->AppMenu())
+          appmenu->active_window = active_xid;
       }
       else if (event->xproperty.atom == Atoms::mwmHints ||
                event->xproperty.atom == Atoms::wmAllowedActions)
 
=== modified file 'decorations/DecorationsSlidingLayout.cpp'
--- decorations/DecorationsSlidingLayout.cpp	2014-02-24 15:50:23 +0000
+++ decorations/DecorationsSlidingLayout.cpp	2015-01-15 14:44:53 +0000
@@ -37,17 +37,13 @@
 SlidingLayout::SlidingLayout()
   : fadein(100)
   , fadeout(120)
+  , override_main_item(false)
   , fade_animator_(fadein())
 {
   items_.resize(2);
   fade_animator_.updated.connect(sigc::hide(sigc::mem_fun(this, &SlidingLayout::Damage)));
-  mouse_owner.changed.connect([this] (bool owner) {
-    if (items_[ItemRole::INPUT])
-    {
-      fade_animator_.SetDuration(owner ? fadein() : fadeout());
-      animation::StartOrReverseIf(fade_animator_, owner);
-    }
-  });
+  mouse_owner.changed.connect(sigc::hide(sigc::mem_fun(this, &SlidingLayout::StartAnimation)));
+  override_main_item.changed.connect(sigc::hide(sigc::mem_fun(this, &SlidingLayout::StartAnimation)));
 }
 
 void SlidingLayout::SetMainItem(Item::Ptr const& main)
@@ -126,6 +122,16 @@
   rect_.setHeight(contents.height);
 }
 
+void SlidingLayout::StartAnimation()
+{
+  if (items_[ItemRole::INPUT])
+  {
+    bool show_input = (mouse_owner() || override_main_item());
+    fade_animator_.SetDuration(show_input ? fadein() : fadeout());
+    animation::StartOrReverseIf(fade_animator_, show_input);
+  }
+}
+
 void SlidingLayout::Draw(GLWindow* ctx, GLMatrix const& transformation, GLWindowPaintAttrib const& attrib, CompRegion const& clip, unsigned mask)
 {
   auto& main_item_ = items_[ItemRole::MAIN];
@@ -152,7 +158,7 @@
   }
   else
   {
-    auto const& draw_area = mouse_owner() ? input_item_ : main_item_;
+    auto const& draw_area = (mouse_owner() || override_main_item()) ? input_item_ : main_item_;
     draw_area->Draw(ctx, transformation, attrib, clip, mask);
   }
 }
 
=== modified file 'decorations/DecorationsSlidingLayout.h'
--- decorations/DecorationsSlidingLayout.h	2014-02-13 07:31:31 +0000
+++ decorations/DecorationsSlidingLayout.h	2015-01-15 14:44:53 +0000
@@ -37,6 +37,7 @@
 
   nux::Property<unsigned> fadein;
   nux::Property<unsigned> fadeout;
+  nux::Property<bool> override_main_item;
 
   void SetMainItem(Item::Ptr const& main);
   void SetInputItem(Item::Ptr const& input);
@@ -47,6 +48,7 @@
 
 private:
   void DoRelayout() override;
+  void StartAnimation();
 
   nux::animation::AnimateValue<double> fade_animator_;
 };
 
=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2014-10-24 13:57:11 +0000
+++ panel/PanelMenuView.cpp	2015-01-15 14:44:53 +0000
@@ -65,7 +65,7 @@
   {
     while (getline(fin, temp))
     {
-      if (temp.substr(0,4) == "NAME")
+      if (temp.substr(0, 4) == "NAME")
       {
         os_release_name = boost::erase_all_copy(temp.substr(temp.find_last_of('=')+1), "\"");
         break;
@@ -98,7 +98,8 @@
   , we_control_active_(false)
   , new_app_menu_shown_(false)
   , ignore_menu_visibility_(false)
-  , integrated_menus_(decoration::Style::Get()->integrated_menus())
+  , integrated_menus_(menu_manager_->integrated_menus())
+  , always_show_menus_(menu_manager_->always_show_menus())
   , active_xid_(0)
   , desktop_name_(get_current_desktop())
 {
@@ -154,19 +155,8 @@
   entry_added.connect(sigc::mem_fun(this, &PanelMenuView::OnEntryViewAdded));
   Style::Instance().changed.connect(sigc::mem_fun(this, &PanelMenuView::OnStyleChanged));
 
-  auto const& deco_style = decoration::Style::Get();
-  lim_changed_connection_ = deco_style->integrated_menus.changed.connect([this] (bool lim) {
-    integrated_menus_ = lim;
-    new_application_ = nullptr;
-    if (!integrated_menus_)
-    {
-      auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-      is_inside_ = GetAbsoluteGeometry().IsInside(mouse);
-      window_buttons_->focused = true;
-    }
-    Refresh(true);
-    FullRedraw();
-  });
+  menu_manager_->integrated_menus.changed.connect(sigc::mem_fun(this, &PanelMenuView::OnLIMChanged));
+  menu_manager_->always_show_menus.changed.connect(sigc::mem_fun(this, &PanelMenuView::OnAlwaysShowMenusChanged));
 }
 
 void PanelMenuView::SetupWindowButtons()
@@ -268,6 +258,31 @@
   window_buttons_->QueueDraw();
 }
 
+void PanelMenuView::OnLIMChanged(bool lim)
+{
+  integrated_menus_ = lim;
+  new_application_ = nullptr;
+
+  if (!integrated_menus_)
+  {
+    CheckMouseInside();
+    window_buttons_->focused = true;
+  }
+
+  Refresh(true);
+  FullRedraw();
+}
+
+void PanelMenuView::OnAlwaysShowMenusChanged(bool always_show_menus)
+{
+  always_show_menus_ = always_show_menus;
+
+  if (!always_show_menus_)
+    CheckMouseInside();
+
+  FullRedraw();
+}
+
 nux::Area* PanelMenuView::FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type)
 {
   bool mouse_inside = TestMousePointerInclusionFilterMouseWheel(mouse_position, event_type);
@@ -376,7 +391,7 @@
 
     if (!wm.IsExpoActive() && !wm.IsScaleActive())
     {
-      if (is_inside_ || last_active_view_ || show_now_activated_ || new_application_)
+      if (is_inside_ || last_active_view_ || show_now_activated_ || new_application_ || always_show_menus_)
         return true;
 
       if (is_maximized_)
@@ -404,7 +419,7 @@
   {
     if (!WindowManager::Default().IsExpoActive())
     {
-      if (is_inside_ || show_now_activated_ || new_application_)
+      if (is_inside_ || show_now_activated_ || new_application_ || always_show_menus_)
         return true;
 
       if (window_buttons_->IsMouseOwner() || titlebar_grab_area_->IsMouseOwner())
@@ -848,6 +863,9 @@
 
 std::string PanelMenuView::GetCurrentTitle() const
 {
+  if (always_show_menus_ && is_maximized_ && we_control_active_)
+    return std::string();
+
   if (integrated_menus_ || (!switcher_showing_ && !launcher_keynav_))
   {
     std::string new_title;
@@ -958,14 +976,10 @@
 
   if (!integrated_menus_ || is_maximized_)
   {
-    auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-    bool inside = GetAbsoluteGeometry().IsInside(mouse);
+    bool was_inside = is_inside_;
 
-    if (is_inside_ != inside)
-    {
-      is_inside_ = inside;
+    if (CheckMouseInside() != was_inside)
       QueueDraw();
-    }
   }
 }
 
@@ -1065,7 +1079,7 @@
     app_name_changed_signal_.Connect(BAMF_VIEW(new_app), "name-changed",
                                      sigc::mem_fun(this, &PanelMenuView::OnNameChanged));
 
-    if (integrated_menus_)
+    if (integrated_menus_ || always_show_menus_)
       return;
 
     if (std::find(new_apps_.begin(), new_apps_.end(), new_app) != new_apps_.end())
@@ -1263,8 +1277,7 @@
     maximized_wins_.push_front(xid);
 
     // We need to update the is_inside_ state in the case of maximization by grab
-    auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-    is_inside_ = GetAbsoluteGeometry().IsInside(mouse);
+    CheckMouseInside();
     is_maximized_ = true;
 
     if (Refresh())
@@ -1674,6 +1687,7 @@
 
   introspection
   .add("mouse_inside", is_inside_)
+  .add("always_show_menus", always_show_menus_)
   .add("grabbed", is_grabbed_)
   .add("active_win_maximized", is_maximized_)
   .add("active_win_is_desktop", is_desktop_focused_)
@@ -1695,7 +1709,7 @@
 
 void PanelMenuView::OnSwitcherShown(GVariant* data)
 {
-  if (!data || integrated_menus_)
+  if (!data || integrated_menus_ || always_show_menus_)
     return;
 
   gboolean switcher_shown;
@@ -1709,8 +1723,7 @@
 
   if (!switcher_showing_)
   {
-    auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-    is_inside_ = GetAbsoluteGeometry().IsInside(mouse);
+    CheckMouseInside();
   }
   else
   {
@@ -1738,9 +1751,7 @@
     return;
 
   launcher_keynav_ = false;
-
-  auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-  is_inside_ = GetAbsoluteGeometry().IsInside(mouse);
+  CheckMouseInside();
 
   if (Refresh())
     QueueDraw();
@@ -1866,8 +1877,22 @@
   return we_control_active_;
 }
 
+bool PanelMenuView::CheckMouseInside()
+{
+  if (always_show_menus_)
+    return is_inside_;
+
+  auto const& mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
+  is_inside_ = GetAbsoluteGeometry().IsInside(mouse);
+
+  return is_inside_;
+}
+
 void PanelMenuView::OnPanelViewMouseEnter(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state)
 {
+  if (always_show_menus_)
+    return;
+
   if (!is_inside_)
   {
     if (is_grabbed_)
@@ -1881,6 +1906,9 @@
 
 void PanelMenuView::OnPanelViewMouseLeave(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state)
 {
+  if (always_show_menus_)
+    return;
+
   if (is_inside_)
   {
     is_inside_ = false;
@@ -1890,6 +1918,9 @@
 
 void PanelMenuView::SetMousePosition(int x, int y)
 {
+  if (always_show_menus_)
+    return;
+
   if (last_active_view_ ||
       (x >= 0 && y >= 0 && GetAbsoluteGeometry().IsPointInside(x, y)))
   {
 
=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2014-10-23 21:37:23 +0000
+++ panel/PanelMenuView.h	2015-01-15 14:44:53 +0000
@@ -91,6 +91,8 @@
   void OnActiveAppChanged(BamfMatcher* matcher, BamfApplication* old_app, BamfApplication* new_app);
   void OnNameChanged(BamfView* bamf_view, gchar* new_name, gchar* old_name);
   void OnStyleChanged();
+  void OnLIMChanged(bool);
+  void OnAlwaysShowMenusChanged(bool);
 
   void OnSpreadInitiate();
   void OnSpreadTerminate();
@@ -133,6 +135,7 @@
   void OnLauncherSelectionChanged(GVariant* data);
 
   void UpdateShowNow(bool ignore);
+  bool CheckMouseInside();
 
   bool UpdateActiveWindowPosition();
   bool UpdateShowNowWithDelay();
@@ -185,6 +188,7 @@
   bool new_app_menu_shown_;
   bool ignore_menu_visibility_;
   bool integrated_menus_;
+  bool always_show_menus_;
 
   Window active_xid_;
   nux::Geometry monitor_geo_;
@@ -196,7 +200,6 @@
   glib::Signal<void, BamfMatcher*, BamfApplication*, BamfApplication*> active_app_changed_signal_;
   glib::Signal<void, BamfView*, gchar*, gchar*> view_name_changed_signal_;
   glib::Signal<void, BamfView*, gchar*, gchar*> app_name_changed_signal_;
-  connection::Wrapper lim_changed_connection_;
 
   UBusManager ubus_manager_;
   glib::SourceManager sources_;
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-12-20 03:12:15 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-01-15 14:44:53 +0000
@@ -3041,7 +3041,7 @@
           }
         }
       }
-      else if (decoration::Style::Get()->integrated_menus())
+      else if (uScreen->menus_->integrated_menus())
       {
         draw_panel_shadow = DrawPanelShadow::BELOW_WINDOW;
       }
 
=== modified file 'unity-shared/DecorationStyle.cpp'
--- unity-shared/DecorationStyle.cpp	2014-08-07 13:15:17 +0000
+++ unity-shared/DecorationStyle.cpp	2015-01-15 14:44:53 +0000
@@ -157,7 +157,6 @@
     gtk_widget_path_append_type(widget_path.get(), unity_decoration_get_type());
     gtk_style_context_set_path(ctx_, widget_path.get());
 
-    parent_->integrated_menus = false;
     parent_->theme = glib::String(GetSettingValue<gchar*>("gtk-theme-name")).Str();
     parent_->font = glib::String(GetSettingValue<gchar*>("gtk-font-name")).Str();
     parent_->font_scale = 1.0;
 
=== modified file 'unity-shared/DecorationStyle.h'
--- unity-shared/DecorationStyle.h	2014-04-02 17:05:04 +0000
+++ unity-shared/DecorationStyle.h	2015-01-15 14:44:53 +0000
@@ -118,7 +118,6 @@
   nux::Property<std::string> theme;
   nux::Property<std::string> font;
   nux::Property<std::string> title_font;
-  nux::Property<bool> integrated_menus;
   nux::Property<unsigned> grab_wait;
   nux::Property<double> font_scale;
 
 
=== modified file 'unity-shared/MenuManager.cpp'
--- unity-shared/MenuManager.cpp	2014-03-05 14:17:43 +0000
+++ unity-shared/MenuManager.cpp	2015-01-15 14:44:53 +0000
@@ -20,6 +20,7 @@
 
 #include <gtk/gtk.h>
 #include <NuxCore/Logger.h>
+#include <UnityCore/GLibSignal.h>
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/DBusIndicators.h>
 #include <unordered_map>
@@ -30,8 +31,15 @@
 {
 namespace menu
 {
+namespace
+{
 DECLARE_LOGGER(logger, "unity.menu.manager");
 
+const std::string SETTINGS_NAME = "com.canonical.Unity";
+const std::string LIM_KEY = "integrated-menus";
+const std::string ALWAYS_SHOW_MENUS_KEY = "always-show-menus";
+}
+
 using namespace indicator;
 
 struct Manager::Impl : sigc::trackable
@@ -40,6 +48,7 @@
     : parent_(parent)
     , indicators_(indicators)
     , key_grabber_(grabber)
+    , settings_(g_settings_new(SETTINGS_NAME.c_str()))
   {
     for (auto const& indicator : indicators_->GetIndicators())
       AddIndicator(indicator);
@@ -49,6 +58,16 @@
     indicators_->on_object_removed.connect(sigc::mem_fun(this, &Impl::RemoveIndicator));
     indicators_->on_entry_activate_request.connect(sigc::mem_fun(this, &Impl::ActivateRequest));
     indicators_->icon_paths_changed.connect(sigc::mem_fun(this, &Impl::IconPathsChanged));
+
+    parent_->integrated_menus = g_settings_get_boolean(settings_, LIM_KEY.c_str());
+    parent_->always_show_menus = g_settings_get_boolean(settings_, ALWAYS_SHOW_MENUS_KEY.c_str());
+
+    signals_.Add<void, GSettings*, const gchar*>(settings_, "changed::" + LIM_KEY, [this] (GSettings*, const gchar*) {
+      parent_->integrated_menus = g_settings_get_boolean(settings_, LIM_KEY.c_str());
+    });
+    signals_.Add<void, GSettings*, const gchar*>(settings_, "changed::" + ALWAYS_SHOW_MENUS_KEY, [this] (GSettings*, const gchar*) {
+      parent_->always_show_menus = g_settings_get_boolean(settings_, ALWAYS_SHOW_MENUS_KEY.c_str());
+    });
   }
 
   ~Impl()
@@ -63,7 +82,7 @@
       return;
 
     appmenu_connections_.Clear();
-    appmenu_ = indicator;
+    appmenu_ = std::static_pointer_cast<AppmenuIndicator>(indicator);
 
     for (auto const& entry : appmenu_->GetEntries())
       GrabEntryMnemonics(entry);
@@ -149,14 +168,18 @@
 
   Manager* parent_;
   Indicators::Ptr indicators_;
-  Indicator::Ptr appmenu_;
+  AppmenuIndicator::Ptr appmenu_;
   key::Grabber::Ptr key_grabber_;
   connection::Manager appmenu_connections_;
+  glib::Object<GSettings> settings_;
+  glib::SignalManager signals_;
   std::unordered_map<std::string, std::shared_ptr<CompAction>> entry_actions_;
 };
 
 Manager::Manager(Indicators::Ptr const& indicators, key::Grabber::Ptr const& grabber)
-  : show_menus_wait(180)
+  : integrated_menus(false)
+  , show_menus_wait(180)
+  , always_show_menus(false)
   , fadein(100)
   , fadeout(120)
   , discovery(2)
@@ -178,7 +201,7 @@
   return impl_->indicators_;
 }
 
-Indicator::Ptr const& Manager::AppMenu() const
+AppmenuIndicator::Ptr const& Manager::AppMenu() const
 {
   return impl_->appmenu_;
 }
 
=== modified file 'unity-shared/MenuManager.h'
--- unity-shared/MenuManager.h	2014-02-13 05:47:03 +0000
+++ unity-shared/MenuManager.h	2015-01-15 14:44:53 +0000
@@ -22,6 +22,7 @@
 
 #include <NuxCore/Property.h>
 #include <UnityCore/Indicators.h>
+#include <UnityCore/AppmenuIndicator.h>
 #include "KeyGrabber.h"
 
 namespace unity
@@ -45,7 +46,10 @@
   typedef std::shared_ptr<Manager> Ptr;
 
   nux::Property<bool> show_menus;
+
+  nux::Property<bool> integrated_menus;
   nux::Property<unsigned> show_menus_wait;
+  nux::Property<bool> always_show_menus;
 
   nux::Property<unsigned> fadein;
   nux::Property<unsigned> fadeout;
@@ -58,7 +62,7 @@
 
   bool HasAppMenu() const;
   indicator::Indicators::Ptr const& Indicators() const;
-  indicator::Indicator::Ptr const& AppMenu() const;
+  indicator::AppmenuIndicator::Ptr const& AppMenu() const;
 
   key::Grabber::Ptr const& KeyGrabber() const;
 
 
=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2014-11-28 12:56:12 +0000
+++ unity-shared/UScreen.cpp	2015-01-15 14:44:53 +0000
@@ -74,13 +74,10 @@
 
 int UScreen::GetMonitorAtPosition(int x, int y) const
 {
-  int idx = 0;
-
-  for (auto const& monitor : monitors_)
+  for (unsigned i = 0; i < monitors_.size(); ++i)
   {
-    if (monitor.IsPointInside(x, y))
-      return idx;
-    ++idx;
+    if (monitors_[i].IsPointInside(x, y))
+      return i;
   }
 
   return gdk_screen_get_monitor_at_point(screen_, x, y);
 
=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2014-09-04 16:47:13 +0000
+++ unity-shared/UnitySettings.cpp	2015-01-15 14:44:53 +0000
@@ -38,7 +38,6 @@
 const std::string SETTINGS_NAME = "com.canonical.Unity";
 const std::string FORM_FACTOR = "form-factor";
 const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
-const std::string LIM_KEY = "integrated-menus";
 
 const std::string LIM_SETTINGS = "com.canonical.Unity.IntegratedMenus";
 const std::string CLICK_MOVEMENT_THRESHOLD = "click-movement-threshold";
@@ -113,10 +112,6 @@
       parent_->double_click_activate.changed.emit(cached_double_click_activate_);
     });
 
-    signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + LIM_KEY, [this] (GSettings*, const gchar*) {
-      UpdateLimSetting();
-    });
-
     signals_.Add<void, GSettings*, const gchar*>(ubuntu_ui_settings_, "changed::" + SCALE_FACTOR, [this] (GSettings*, const gchar* t) {
       UpdateDPI();
     });
@@ -190,7 +185,6 @@
 
   void UpdateLimSetting()
   {
-    decoration::Style::Get()->integrated_menus = g_settings_get_boolean(usettings_, LIM_KEY.c_str());
     parent_->lim_movement_thresold = g_settings_get_uint(lim_settings_, CLICK_MOVEMENT_THRESHOLD.c_str());
     parent_->lim_double_click_wait = g_settings_get_uint(lim_settings_, DOUBLE_CLICK_WAIT.c_str());
   }