summaryrefslogtreecommitdiff
path: root/launcher
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2013-11-20 04:13:27 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2013-11-20 04:13:27 +0100
commitdf784e49fb207de548f77bb345e53705bb3e1370 (patch)
tree9e5505a60b242c08916fe663ff780b4ce4e0a3cd /launcher
parent038ae614975365a91b5631575adb5c9e8bbf811c (diff)
BackgroundEffectHelper: add new constructor that allows to define owner immediately
And use it in Panel, UnityWindowView and Launcher (bzr r3347.7.5)
Diffstat (limited to 'launcher')
-rw-r--r--launcher/Launcher.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/launcher/Launcher.cpp b/launcher/Launcher.cpp
index 29ffceab7..319227dff 100644
--- a/launcher/Launcher.cpp
+++ b/launcher/Launcher.cpp
@@ -134,6 +134,7 @@ Launcher::Launcher(MockableBaseWindow* parent,
, drag_gesture_ongoing_(false)
, last_reveal_progress_(0.0f)
, drag_action_(nux::DNDACTION_NONE)
+ , bg_effect_helper_(this)
, auto_hide_animation_(ANIM_DURATION_SHORT)
, hover_animation_(ANIM_DURATION)
, drag_over_animation_(ANIM_DURATION_LONG)
@@ -145,9 +146,6 @@ Launcher::Launcher(MockableBaseWindow* parent,
icon_renderer_->monitor = monitor();
icon_renderer_->SetTargetSize(icon_size_, DEFAULT_ICON_SIZE, SPACE_BETWEEN_ICONS);
- bg_effect_helper_.owner = this;
- bg_effect_helper_.enabled = false;
-
CaptureMouseDownAnyWhereElse(true);
SetAcceptKeyNavFocusOnMouseDown(false);
SetAcceptMouseWheelEvent(true);