From 64c46639db33b6bcb52219af867374ef6a9ebba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 12 Feb 2014 08:45:21 +0100 Subject: 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) --- unity-shared/MenuManager.cpp | 7 ++++++- unity-shared/MenuManager.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'unity-shared') 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 Ptr; nux::Property show_menus; + nux::Property fadein; + nux::Property fadeout; + nux::Property discovery; + nux::Property discovery_fadein; + nux::Property discovery_fadeout; Manager(indicator::Indicators::Ptr const&, key::Grabber::Ptr const&); virtual ~Manager(); -- cgit v1.2.3