summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2014-02-12 08:45:21 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2014-02-12 08:45:21 +0100
commit64c46639db33b6bcb52219af867374ef6a9ebba0 (patch)
tree51c5f140bd49c3b7219fb4037d564b1f8d36e220 /unity-shared
parentae8a0059300244e9cd12e14254ce5317da96a2ad (diff)
MenuManager: add nux::Property's to handle menu settings
This is way better than passing the single values so many times in the panel (bzr r3652.3.6)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/MenuManager.cpp7
-rw-r--r--unity-shared/MenuManager.h5
2 files changed, 11 insertions, 1 deletions
diff --git a/unity-shared/MenuManager.cpp b/unity-shared/MenuManager.cpp
index d33f6dbcf..7f2b3be62 100644
--- a/unity-shared/MenuManager.cpp
+++ b/unity-shared/MenuManager.cpp
@@ -131,7 +131,12 @@ struct Manager::Impl : sigc::trackable
};
Manager::Manager(Indicators::Ptr const& indicators, key::Grabber::Ptr const& grabber)
- : impl_(new Impl(this, indicators, grabber))
+ : fadein(100)
+ , fadeout(120)
+ , discovery(2)
+ , discovery_fadein(200)
+ , discovery_fadeout(300)
+ , impl_(new Impl(this, indicators, grabber))
{}
Manager::~Manager()
diff --git a/unity-shared/MenuManager.h b/unity-shared/MenuManager.h
index 7d1e7f82e..354ce9351 100644
--- a/unity-shared/MenuManager.h
+++ b/unity-shared/MenuManager.h
@@ -45,6 +45,11 @@ public:
typedef std::shared_ptr<Manager> Ptr;
nux::Property<bool> show_menus;
+ nux::Property<unsigned> fadein;
+ nux::Property<unsigned> fadeout;
+ nux::Property<unsigned> discovery;
+ nux::Property<unsigned> discovery_fadein;
+ nux::Property<unsigned> discovery_fadeout;
Manager(indicator::Indicators::Ptr const&, key::Grabber::Ptr const&);
virtual ~Manager();