summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2014-12-19 13:01:47 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2014-12-19 13:01:47 +0100
commit1b78bc179f8a27dcec7aa6986cda39f4b3c226ce (patch)
tree898b35dd7544604fec1afbac709b0aff83846bdf /unity-shared
parent658b52866527f80b842b91727c15dc64351e1d0e (diff)
MenuManager: add always_show_menus property
False by default Fixes LP: #955193 (bzr r3884.9.9)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/MenuManager.cpp1
-rw-r--r--unity-shared/MenuManager.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/unity-shared/MenuManager.cpp b/unity-shared/MenuManager.cpp
index b652030bb..238db41bd 100644
--- a/unity-shared/MenuManager.cpp
+++ b/unity-shared/MenuManager.cpp
@@ -157,6 +157,7 @@ struct Manager::Impl : sigc::trackable
Manager::Manager(Indicators::Ptr const& indicators, key::Grabber::Ptr const& grabber)
: show_menus_wait(180)
+ , always_show_menus(false)
, fadein(100)
, fadeout(120)
, discovery(2)
diff --git a/unity-shared/MenuManager.h b/unity-shared/MenuManager.h
index 61eb413fc..fed7d157c 100644
--- a/unity-shared/MenuManager.h
+++ b/unity-shared/MenuManager.h
@@ -47,6 +47,7 @@ public:
nux::Property<bool> show_menus;
nux::Property<unsigned> show_menus_wait;
+ nux::Property<bool> always_show_menus;
nux::Property<unsigned> fadein;
nux::Property<unsigned> fadeout;