2 files changed, 10 insertions, 4 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index f00fd11bd..f7f9139db 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -24,6 +24,7 @@
 #include <Nux/HLayout.h>
 #include <Nux/BaseWindow.h>
 #include <Nux/WindowCompositor.h>
+#include <Nux/NuxTimerTickSource.h>
 
 #include "BaseWindowRaiserImp.h"
 #include "IconRenderer.h"
@@ -113,7 +114,7 @@ UnityScreen::UnityScreen(CompScreen* screen)
 , screen(screen)
 , cScreen(CompositeScreen::get(screen))
 , gScreen(GLScreen::get(screen))
- , animation_controller_(tick_source_)
+ //, animation_controller_(tick_source_)
 , debugger_(this)
 , enable_shortcut_overlay_(true)
 , needsRelayout(false)
@@ -235,6 +236,9 @@ UnityScreen::UnityScreen(CompScreen* screen)
 this));
 #endif
 
+ tick_source_.reset(new nux::NuxTimerTickSource);
+ animation_controller_.reset(new na::AnimationController(*tick_source_));
+
 wt->RedrawRequested.connect(sigc::mem_fun(this, &UnityScreen::onRedrawRequested));
 
 unity_a11y_init(wt.get());
@@ -1222,7 +1226,7 @@ void UnityScreen::preparePaint(int ms)
 
 // Emit the current time throught the tick_source. This moves any running
 // animations along their path.
- tick_source_.tick(g_get_monotonic_time());
+ //tick_source_.tick(g_get_monotonic_time());
 
 for (ShowdesktopHandlerWindowInterface *wi : ShowdesktopHandler::animating_windows)
 wi->HandleAnimations (ms);
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index b970a7567..9699b92db 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -245,8 +245,10 @@ private:
 bool TopPanelBackgroundTextureNeedsUpdate() const;
 void UpdateTopPanelBackgroundTexture();
 
- nux::animation::TickSource tick_source_;
- nux::animation::AnimationController animation_controller_;
+ // nux::animation::TickSource tick_source_;
+ // nux::animation::AnimationController animation_controller_;
+ std::unique_ptr<nux::NuxTimerTickSource> tick_source_;
+ std::unique_ptr<na::AnimationController> animation_controller_;
 
 Settings dash_settings_;
 dash::Style dash_style_;