summaryrefslogtreecommitdiff
path: root/plugins/unityshell/src
diff options
authorJay Taoko <jay.taoko@canonical.com>2012-09-18 15:59:06 +0200
committerJay Taoko <jay.taoko@canonical.com>2012-09-18 15:59:06 +0200
commitb94ef1ee477b7b0c67f687780dbc204c8e405a90 (patch)
treed2c4687981fba611f372719051937b74dc20c986 /plugins/unityshell/src
parent98f578e1d7aec3fea2bd59fa1a52d4c64de7216d (diff)
* Cleanup "
* Added manual test. (bzr r2708.2.4)
Diffstat (limited to 'plugins/unityshell/src')
-rw-r--r--plugins/unityshell/src/unityshell.cpp5
-rw-r--r--plugins/unityshell/src/unityshell.h2
2 files changed, 0 insertions, 7 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 61ae605ce..f1c59d49f 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -114,7 +114,6 @@ UnityScreen::UnityScreen(CompScreen* screen)
, screen(screen)
, cScreen(CompositeScreen::get(screen))
, gScreen(GLScreen::get(screen))
- //, animation_controller_(tick_source_)
, debugger_(this)
, enable_shortcut_overlay_(true)
, needsRelayout(false)
@@ -1245,10 +1244,6 @@ void UnityScreen::preparePaint(int ms)
{
cScreen->preparePaint(ms);
- // Emit the current time throught the tick_source. This moves any running
- // animations along their path.
- // 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 a5e4f85b3..1c3091497 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -245,8 +245,6 @@ private:
bool TopPanelBackgroundTextureNeedsUpdate() const;
void UpdateTopPanelBackgroundTexture();
- // nux::animation::TickSource tick_source_;
- // nux::animation::AnimationController animation_controller_;
std::unique_ptr<nux::NuxTimerTickSource> tick_source_;
std::unique_ptr<na::AnimationController> animation_controller_;