Merge lp:~unity-team/unity/unity.dont-emit-on-id-change into lp:unity

[Jason Smith]

UNBLOCK

Fixes launcher reveal for some people

[Gord Allott (gordallott)]

review: Approve

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-01-31 11:26:07 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-02-01 01:11:26 +0000
@@ -199,9 +199,6 @@
   _launcher_bottom_y      = 0;
   _folded_z_distance      = 10.0f;
   _launcher_action_state  = ACTION_NONE;
-  _launch_animation       = LAUNCH_ANIMATION_NONE;
-  _urgent_animation       = URGENT_ANIMATION_NONE;
-  _autohide_animation     = FADE_AND_SLIDE;
   _hidemode               = LAUNCHER_HIDE_NEVER;
   _icon_under_mouse       = NULL;
   _icon_mouse_down        = NULL;
@@ -210,7 +207,6 @@
   _icon_glow_size         = 62;
   _icon_image_size_delta  = 6;
   _icon_size              = _icon_image_size + _icon_image_size_delta;
-  _background_alpha       = 0.6667; // about 0xAA
 
   _enter_y                = 0;
   _launcher_drag_delta    = 0;
@@ -222,16 +218,15 @@
   _dnd_check_handle              = 0;
 
   _shortcuts_shown        = false;
-  _floating               = false;
   _hovered                = false;
   _hidden                 = false;
   _render_drag_window     = false;
   _drag_edge_touching     = false;
-  _backlight_mode         = BACKLIGHT_NORMAL;
   _last_button_press      = 0;
   _selection_atom         = 0;
   _drag_out_id            = 0;
   _drag_out_delta_x       = 0.0f;
+  _edge_overcome_pressure = 0.0f;
 
   // FIXME: remove
   _initial_drag_animation = false;
@@ -404,7 +399,6 @@
   .add("dnd-exit-progress", DnDExitProgress(current))
   .add("autohide-progress", AutohideProgress(current))
   .add("dnd-delta", _dnd_delta_y)
-  .add("floating", _floating)
   .add("hovered", _hovered)
   .add("hidemode", _hidemode)
   .add("hidden", _hidden)
@@ -609,7 +603,7 @@
 /* Min is when you are on the trigger */
 float Launcher::GetAutohidePositionMin() const
 {
-  if (_autohide_animation == SLIDE_ONLY || _autohide_animation == FADE_AND_SLIDE)
+  if (options()->auto_hide_animation() == SLIDE_ONLY || options()->auto_hide_animation() == FADE_AND_SLIDE)
     return 0.35f;
   else
     return 0.25f;
@@ -617,7 +611,7 @@
 /* Max is the initial state over the bfb */
 float Launcher::GetAutohidePositionMax() const
 {
-  if (_autohide_animation == SLIDE_ONLY || _autohide_animation == FADE_AND_SLIDE)
+  if (options()->auto_hide_animation() == SLIDE_ONLY || options()->auto_hide_animation() == FADE_AND_SLIDE)
     return 1.00f;
   else
     return 0.75f;
@@ -684,7 +678,7 @@
   int urgent_ms = unity::TimeUtil::TimeDelta(&current, &urgent_time);
   float result;
 
-  if (_urgent_animation == URGENT_ANIMATION_WIGGLE)
+  if (options()->urgent_animation() == URGENT_ANIMATION_WIGGLE)
     result = CLAMP((float) urgent_ms / (float)(ANIM_DURATION_SHORT * WIGGLE_CYCLES), 0.0f, 1.0f);
   else
     result = CLAMP((float) urgent_ms / (float)(ANIM_DURATION_LONG * URGENT_BLINKS * 2), 0.0f, 1.0f);
@@ -803,22 +797,22 @@
     icon->SetQuirk(AbstractLauncherIcon::QUIRK_STARTING, false);
 
   float backlight_strength;
-  if (_backlight_mode == BACKLIGHT_ALWAYS_ON)
+  if (options()->backlight_mode() == BACKLIGHT_ALWAYS_ON)
     backlight_strength = BACKLIGHT_STRENGTH;
   else if (IsBackLightModeToggles())
     backlight_strength = BACKLIGHT_STRENGTH * running_progress;
   else
     backlight_strength = 0.0f;
 
-  switch (_launch_animation)
+  switch (options()->launch_animation())
   {
     case LAUNCH_ANIMATION_NONE:
       result = backlight_strength;
       break;
     case LAUNCH_ANIMATION_BLINK:
-      if (_backlight_mode == BACKLIGHT_ALWAYS_ON)
+      if (options()->backlight_mode() == BACKLIGHT_ALWAYS_ON)
         result = IconStartingBlinkValue(icon, current);
-      else if (_backlight_mode == BACKLIGHT_ALWAYS_OFF)
+      else if (options()->backlight_mode() == BACKLIGHT_ALWAYS_OFF)
         result = 1.0f - IconStartingBlinkValue(icon, current);
       else
         result = backlight_strength; // The blink concept is a failure in this case (it just doesn't work right)
@@ -828,7 +822,7 @@
         icon->ResetQuirkTime(AbstractLauncherIcon::QUIRK_STARTING);
 
       result = backlight_strength;
-      if (_backlight_mode == BACKLIGHT_ALWAYS_ON)
+      if (options()->backlight_mode() == BACKLIGHT_ALWAYS_ON)
         result *= CLAMP(running_progress + IconStartingPulseValue(icon, current), 0.0f, 1.0f);
       else if (IsBackLightModeToggles())
         result += (BACKLIGHT_STRENGTH - result) * (1.0f - IconStartingPulseValue(icon, current));
@@ -839,16 +833,16 @@
 
   if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_PULSE_ONCE))
   {
-    if (_backlight_mode == BACKLIGHT_ALWAYS_ON)
+    if (options()->backlight_mode() == BACKLIGHT_ALWAYS_ON)
       result *= CLAMP(running_progress + IconPulseOnceValue(icon, current), 0.0f, 1.0f);
-    else if (_backlight_mode == BACKLIGHT_NORMAL)
+    else if (options()->backlight_mode() == BACKLIGHT_NORMAL)
       result += (BACKLIGHT_STRENGTH - result) * (1.0f - IconPulseOnceValue(icon, current));
     else
       result = 1.0f - CLAMP(running_progress + IconPulseOnceValue(icon, current), 0.0f, 1.0f);
   }
 
   // urgent serves to bring the total down only
-  if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_URGENT) && _urgent_animation == URGENT_ANIMATION_PULSE)
+  if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_URGENT) && options()->urgent_animation() == URGENT_ANIMATION_PULSE)
     result *= 0.2f + 0.8f * IconUrgentPulseValue(icon, current);
 
   return result;
@@ -868,10 +862,10 @@
 
 bool Launcher::IconDrawEdgeOnly(AbstractLauncherIcon* icon) const
 {
-  if (_backlight_mode == BACKLIGHT_EDGE_TOGGLE)
+  if (options()->backlight_mode() == BACKLIGHT_EDGE_TOGGLE)
     return true;
 
-  if (_backlight_mode == BACKLIGHT_NORMAL_EDGE_TOGGLE && !icon->WindowVisibleOnMonitor(monitor))
+  if (options()->backlight_mode() == BACKLIGHT_NORMAL_EDGE_TOGGLE && !icon->WindowVisibleOnMonitor(monitor))
     return true;
 
   return false;
@@ -938,7 +932,7 @@
     urgent_progress = CLAMP(urgent_progress * 3.0f - 2.0f, 0.0f, 1.0f);  // we want to go 3x faster than the urgent normal cycle
   arg.glow_intensity = urgent_progress;
 
-  if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_URGENT) && _urgent_animation == URGENT_ANIMATION_WIGGLE)
+  if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_URGENT) && options()->urgent_animation() == URGENT_ANIMATION_WIGGLE)
   {
     arg.z_rotation = IconUrgentWiggleValue(icon, current);
   }
@@ -1101,7 +1095,7 @@
   {
 
     float autohide_progress = AutohideProgress(current) * (1.0f - DragOutProgress(current));
-    if (_autohide_animation == FADE_ONLY)
+    if (options()->auto_hide_animation() == FADE_ONLY)
     {
       *launcher_alpha = 1.0f - autohide_progress;
     }
@@ -1110,7 +1104,7 @@
       if (autohide_progress > 0.0f)
       {
         autohide_offset -= geo.width * autohide_progress;
-        if (_autohide_animation == FADE_AND_SLIDE)
+        if (options()->auto_hide_animation() == FADE_AND_SLIDE)
           *launcher_alpha = 1.0f - 0.5f * autohide_progress;
       }
     }
@@ -1554,20 +1548,24 @@
 Launcher::UpdateOptions(Options::Ptr options)
 {
   SetHideMode(options->hide_mode);
-  SetAutoHideAnimation(options->auto_hide_animation);
-  SetFloating(options->floating);
-  SetBacklightMode(options->backlight_mode);
-  SetLaunchAnimation(options->launch_animation);
-  SetUrgentAnimation(options->urgent_animation);
   SetIconSize(options->tile_size, options->icon_size);
-  decaymulator_->rate_of_decay = options->edge_decay_rate();
+
+  // make the effect half as strong as specified as other values shouldn't scale
+  // as quickly as the max velocity multiplier
+  float responsiveness_mult = ((options->edge_responsiveness() - 1) * .025) + 1;
+
+  decaymulator_->rate_of_decay = options->edge_decay_rate() * responsiveness_mult;
+  _edge_overcome_pressure = options->edge_overcome_pressure() * responsiveness_mult;
 
   _pointer_barrier->threshold = options->edge_stop_velocity();
+  _pointer_barrier->max_velocity_multiplier = options->edge_responsiveness();
   _pointer_barrier->DestroyBarrier();
   _pointer_barrier->ConstructBarrier();
 
-  _hide_machine->reveal_pressure = options->edge_reveal_pressure();
-  _hide_machine->edge_decay_rate = options->edge_decay_rate();
+  _hide_machine->reveal_pressure = options->edge_reveal_pressure() * responsiveness_mult;
+  _hide_machine->edge_decay_rate = options->edge_decay_rate() * responsiveness_mult;
+
+  EnsureAnimation();
 }
 
 void Launcher::SetHideMode(LauncherHideMode hidemode)
@@ -1591,45 +1589,14 @@
   EnsureAnimation();
 }
 
-AutoHideAnimation Launcher::GetAutoHideAnimation() const
-{
-  return _autohide_animation;
-}
-
-void Launcher::SetAutoHideAnimation(AutoHideAnimation animation)
-{
-  if (_autohide_animation == animation)
-    return;
-
-  _autohide_animation = animation;
-}
-
-void Launcher::SetFloating(bool floating)
-{
-  if (_floating == floating)
-    return;
-
-  _floating = floating;
-  EnsureAnimation();
-}
-
-void Launcher::SetBacklightMode(BacklightMode mode)
-{
-  if (_backlight_mode == mode)
-    return;
-
-  _backlight_mode = mode;
-  EnsureAnimation();
-}
-
 BacklightMode Launcher::GetBacklightMode() const
 {
-  return _backlight_mode;
+  return options()->backlight_mode();
 }
 
 bool Launcher::IsBackLightModeToggles() const
 {
-  switch (_backlight_mode) {
+  switch (options()->backlight_mode()) {
     case BACKLIGHT_NORMAL:
     case BACKLIGHT_EDGE_TOGGLE:
     case BACKLIGHT_NORMAL_EDGE_TOGGLE:
@@ -1640,36 +1607,6 @@
 }
 
 void
-Launcher::SetLaunchAnimation(LaunchAnimation animation)
-{
-  if (_launch_animation == animation)
-    return;
-
-  _launch_animation = animation;
-}
-
-LaunchAnimation
-Launcher::GetLaunchAnimation() const
-{
-  return _launch_animation;
-}
-
-void
-Launcher::SetUrgentAnimation(UrgentAnimation animation)
-{
-  if (_urgent_animation == animation)
-    return;
-
-  _urgent_animation = animation;
-}
-
-UrgentAnimation
-Launcher::GetUrgentAnimation() const
-{
-  return _urgent_animation;
-}
-
-void
 Launcher::SetActionState(LauncherActionState actionstate)
 {
   if (_launcher_action_state == actionstate)
@@ -1812,15 +1749,6 @@
 
 }
 
-void Launcher::SetBackgroundAlpha(float background_alpha)
-{
-  if (_background_alpha == background_alpha)
-    return;
-
-  _background_alpha = background_alpha;
-  NeedRedraw();
-}
-
 void Launcher::OnIconAdded(AbstractLauncherIcon* icon)
 {
   EnsureAnimation();
@@ -2008,7 +1936,7 @@
   else
   {
     nux::Color color = _background_color;
-    color.alpha = _background_alpha;
+    color.alpha = options()->background_alpha;
     gPainter.Paint2DQuadColor(GfxContext, bkg_box, color);
   }
 
@@ -2386,10 +2314,10 @@
     _hide_machine->AddRevealPressure(event->velocity);
     decaymulator_->value = 0;
   }
-  else
+  else if (abs_geo.x > 0)
   {
     decaymulator_->value = decaymulator_->value + event->velocity;
-    if (decaymulator_->value > options()->edge_overcome_pressure)
+    if (decaymulator_->value > _edge_overcome_pressure)
     {
       _pointer_barrier->ReleaseBarrier(event->event_id);
     }
 
=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2012-01-29 05:07:56 +0000
+++ plugins/unityshell/src/Launcher.h	2012-02-01 01:11:26 +0000
@@ -78,7 +78,6 @@
   AbstractLauncherIcon* GetSelectedMenuIcon() const;
 
   void SetIconSize(int tile_size, int icon_size);
-  void SetBackgroundAlpha(float background_alpha);
 
   LauncherHideMachine* HideMachine() { return _hide_machine; }
 
@@ -93,11 +92,6 @@
   void SetModel(LauncherModel* model);
   LauncherModel* GetModel() const;
 
-  void SetFloating(bool floating);
-
-  void SetHideMode(LauncherHideMode hidemode);
-  LauncherHideMode GetHideMode() const;
-
   void StartKeyShowLauncher();
   void EndKeyShowLauncher();
 
@@ -107,15 +101,6 @@
   BacklightMode GetBacklightMode() const;
   bool IsBackLightModeToggles() const;
 
-  void SetLaunchAnimation(LaunchAnimation animation);
-  LaunchAnimation GetLaunchAnimation() const;
-
-  void SetUrgentAnimation(UrgentAnimation animation);
-  UrgentAnimation GetUrgentAnimation() const;
-
-  void SetAutoHideAnimation(AutoHideAnimation animation);
-  AutoHideAnimation GetAutoHideAnimation() const;
-
   nux::BaseWindow* GetParent() const
   {
     return _parent;
@@ -166,6 +151,9 @@
 private:
   typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
 
+  LauncherHideMode GetHideMode() const;
+  void SetHideMode(LauncherHideMode hidemode);
+
   typedef enum
   {
     ACTION_NONE,
@@ -343,7 +331,6 @@
   QuicklistView* _active_quicklist;
 
   bool  _hovered;
-  bool  _floating;
   bool  _hidden;
   bool  _render_drag_window;
   bool  _check_window_over_launcher;
@@ -357,13 +344,13 @@
   float _folded_z_distance;
   float _launcher_top_y;
   float _launcher_bottom_y;
+  float _edge_overcome_pressure;
 
   LauncherHideMode _hidemode;
 
   LauncherActionState _launcher_action_state;
   LaunchAnimation _launch_animation;
   UrgentAnimation _urgent_animation;
-  AutoHideAnimation _autohide_animation;
 
   nux::ObjectPtr<nux::IOpenGLBaseTexture> _offscreen_drag_texture;
 
 
=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-01-30 18:48:50 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-02-01 01:11:26 +0000
@@ -763,19 +763,6 @@
 Controller::Controller(Display* display)
 {
   options = Options::Ptr(new Options());
-
-  // defaults must match XML file
-  options()->tile_size = 54;
-  options()->icon_size = 48;
-  options()->backlight_mode = BACKLIGHT_ALWAYS_ON;
-  options()->hide_mode = LAUNCHER_HIDE_DODGE_WINDOWS;
-  options()->launch_animation = LAUNCH_ANIMATION_PULSE;
-  options()->urgent_animation = URGENT_ANIMATION_WIGGLE;
-  options()->edge_reveal_pressure = 2000;
-  options()->edge_overcome_pressure = 2000;
-  options()->edge_decay_rate = 1500;
-  options()->edge_stop_velocity = 4500;
-
   // options must be set before creating pimpl which loads launchers
   pimpl = new Impl(display, this);
 }
 
=== modified file 'plugins/unityshell/src/LauncherOptions.cpp'
--- plugins/unityshell/src/LauncherOptions.cpp	2012-01-26 03:41:09 +0000
+++ plugins/unityshell/src/LauncherOptions.cpp	2012-02-01 01:11:26 +0000
@@ -27,69 +27,34 @@
 
 Options::Options()
 {
-  hide_mode.changed.connect(sigc::mem_fun (this, &Options::OnHideModeChanged));
-  launch_animation.changed.connect(sigc::mem_fun (this, &Options::OnLaunchAnimationChanged));
-  urgent_animation.changed.connect(sigc::mem_fun (this, &Options::OnUrgentAnimationChanged));
-  auto_hide_animation.changed.connect(sigc::mem_fun (this, &Options::OnAutoHideAnimationChanged));
-  backlight_mode.changed.connect(sigc::mem_fun (this, &Options::OnBacklightModeChanged));
-  icon_size.changed.connect(sigc::mem_fun (this, &Options::OnIconSizeChanged));
-  tile_size.changed.connect(sigc::mem_fun (this, &Options::OnTileSizeChanged));
-  floating.changed.connect(sigc::mem_fun (this, &Options::OnFloatingChanged));
-  background_alpha.changed.connect(sigc::mem_fun (this, &Options::OnBackgroundAlphaChanged));
-  edge_decay_rate.changed.connect(sigc::mem_fun (this, &Options::OnEdgeOptionChanged));
-  edge_overcome_pressure.changed.connect(sigc::mem_fun (this, &Options::OnEdgeOptionChanged));
-  edge_stop_velocity.changed.connect(sigc::mem_fun (this, &Options::OnEdgeOptionChanged));
-  edge_reveal_pressure.changed.connect(sigc::mem_fun (this, &Options::OnEdgeOptionChanged));
-}
-
-void Options::OnEdgeOptionChanged(int value)
-{
-  option_changed.emit();
-}
-
-void Options::OnHideModeChanged(LauncherHideMode value)
-{
-  option_changed.emit();
-}
-
-void Options::OnLaunchAnimationChanged(LaunchAnimation value)
-{
-  option_changed.emit();
-}
-
-void Options::OnUrgentAnimationChanged(UrgentAnimation value)
-{
-  option_changed.emit();
-}
-
-void Options::OnAutoHideAnimationChanged(AutoHideAnimation value)
-{
-  option_changed.emit();
-}
-
-void Options::OnBacklightModeChanged(BacklightMode value)
-{
-  option_changed.emit();
-}
-
-void Options::OnIconSizeChanged(int value)
-{
-  option_changed.emit();
-}
-
-void Options::OnTileSizeChanged(int value)
-{
-  option_changed.emit();
-}
-
-void Options::OnFloatingChanged(bool value)
-{
-  option_changed.emit();
-}
-
-void Options::OnBackgroundAlphaChanged(float value)
-{
-  option_changed.emit();
+  // defaults from XML file
+  auto_hide_animation = FADE_AND_SLIDE;
+  background_alpha = 0.6667;
+  backlight_mode = BACKLIGHT_ALWAYS_ON;
+  edge_decay_rate = 1500;
+  edge_overcome_pressure = 2000;
+  edge_responsiveness = 1.0f;
+  edge_reveal_pressure = 2000;
+  edge_stop_velocity = 4500;
+  hide_mode = LAUNCHER_HIDE_DODGE_WINDOWS;
+  icon_size = 48;
+  launch_animation = LAUNCH_ANIMATION_PULSE;
+  tile_size = 54;
+  urgent_animation = URGENT_ANIMATION_WIGGLE;
+
+  auto_hide_animation.changed.connect   ([&] (AutoHideAnimation value)-> void { option_changed.emit(); });
+  background_alpha.changed.connect      ([&] (float value)            -> void { option_changed.emit(); });
+  backlight_mode.changed.connect        ([&] (BacklightMode value)    -> void { option_changed.emit(); });
+  edge_decay_rate.changed.connect       ([&] (int value)              -> void { option_changed.emit(); });
+  edge_overcome_pressure.changed.connect([&] (int value)              -> void { option_changed.emit(); });
+  edge_responsiveness.changed.connect   ([&] (float value)            -> void { option_changed.emit(); });
+  edge_reveal_pressure.changed.connect  ([&] (int value)              -> void { option_changed.emit(); });
+  edge_stop_velocity.changed.connect    ([&] (int value)              -> void { option_changed.emit(); });
+  hide_mode.changed.connect             ([&] (LauncherHideMode value) -> void { option_changed.emit(); });
+  icon_size.changed.connect             ([&] (int value)              -> void { option_changed.emit(); });
+  launch_animation.changed.connect      ([&] (LaunchAnimation value)  -> void { option_changed.emit(); });
+  tile_size.changed.connect             ([&] (int value)              -> void { option_changed.emit(); });
+  urgent_animation.changed.connect      ([&] (UrgentAnimation value)  -> void { option_changed.emit(); });
 }
 
 
 
=== modified file 'plugins/unityshell/src/LauncherOptions.h'
--- plugins/unityshell/src/LauncherOptions.h	2012-01-26 03:41:09 +0000
+++ plugins/unityshell/src/LauncherOptions.h	2012-02-01 01:11:26 +0000
@@ -86,26 +86,14 @@
   nux::Property<BacklightMode> backlight_mode;
   nux::Property<int> icon_size;
   nux::Property<int> tile_size;
-  nux::Property<bool> floating;
   nux::Property<float> background_alpha;
   nux::Property<int> edge_decay_rate;
   nux::Property<int> edge_overcome_pressure;
   nux::Property<int> edge_stop_velocity;
   nux::Property<int> edge_reveal_pressure;
+  nux::Property<float> edge_responsiveness;
 
   sigc::signal<void> option_changed;
-
-private:
-  void OnHideModeChanged(LauncherHideMode value);
-  void OnLaunchAnimationChanged(LaunchAnimation value);
-  void OnUrgentAnimationChanged(UrgentAnimation value);
-  void OnAutoHideAnimationChanged(AutoHideAnimation value);
-  void OnBacklightModeChanged(BacklightMode value);
-  void OnIconSizeChanged(int value);
-  void OnEdgeOptionChanged(int value);
-  void OnTileSizeChanged(int value);
-  void OnFloatingChanged(bool value);
-  void OnBackgroundAlphaChanged(float value);
 };
 
 }
 
=== modified file 'plugins/unityshell/src/PointerBarrier.cpp'
--- plugins/unityshell/src/PointerBarrier.cpp	2012-01-30 18:38:12 +0000
+++ plugins/unityshell/src/PointerBarrier.cpp	2012-02-01 01:11:26 +0000
@@ -44,6 +44,8 @@
   smoothing = 75;
   smoothing_count_ = 0;
   smoothing_accum_ = 0;
+  smoothing_handle_ = 0;
+  max_velocity_multiplier = 1.0f;
 }
 
 void PointerBarrierWrapper::ConstructBarrier()
@@ -108,7 +110,7 @@
   BarrierEvent::Ptr event (new BarrierEvent());
   event->x = last_x_;
   event->y = last_y_;
-  event->velocity = std::min<int> (600, smoothing_accum_ / smoothing_count_);
+  event->velocity = std::min<int> (600 * max_velocity_multiplier, smoothing_accum_ / smoothing_count_);
   event->event_id = last_event_;
 
   barrier_event.emit(this, event);
@@ -125,16 +127,6 @@
 
     if (notify_event->barrier == barrier && notify_event->subtype == XFixesBarrierHitNotify)
     {
-      if (notify_event->event_id != last_event_)
-      {
-        EmitCurrentData();
-        if (smoothing_handle_)
-        {
-          g_source_remove(smoothing_handle_);
-          smoothing_handle_ = 0;
-        }
-      }
-
       last_x_ = notify_event->x;
       last_y_ = notify_event->y;
       last_event_ = notify_event->event_id;
 
=== modified file 'plugins/unityshell/src/PointerBarrier.h'
--- plugins/unityshell/src/PointerBarrier.h	2012-01-27 03:28:20 +0000
+++ plugins/unityshell/src/PointerBarrier.h	2012-02-01 01:11:26 +0000
@@ -57,6 +57,8 @@
 
   nux::Property<int> smoothing;
 
+  nux::Property<float> max_velocity_multiplier;
+
   PointerBarrierWrapper();
 
   void ConstructBarrier();
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-01-29 22:41:55 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-02-01 01:11:26 +0000
@@ -309,6 +309,7 @@
 
      optionSetStopVelocityNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetRevealPressureNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+     optionSetEdgeResponsivenessNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetOvercomePressureNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetDecayRateNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetShowMinimizedWindowsNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -2165,7 +2166,7 @@
   {
     nux::Geometry geo = launcher->GetAbsoluteGeometry();
     
-    if (launcher->Hidden() || launcher->GetHideMode() == LAUNCHER_HIDE_NEVER || launcher->GetHideMode() == LAUNCHER_HIDE_AUTOHIDE)
+    if (launcher->Hidden() || launcher->options()->hide_mode == LAUNCHER_HIDE_NEVER || launcher->options()->hide_mode == LAUNCHER_HIDE_AUTOHIDE)
       continue;
     
     if (geo.IsInside(result))
@@ -2368,6 +2369,8 @@
       break;
     case UnityshellOptions::RevealPressure:
       launcher_options->edge_reveal_pressure = optionGetRevealPressure() * 100;
+    case UnityshellOptions::EdgeResponsiveness:
+      launcher_options->edge_responsiveness = optionGetEdgeResponsiveness();
       break;
     default:
       break;
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2012-01-30 18:40:04 +0000
+++ plugins/unityshell/unityshell.xml.in	2012-02-01 01:11:26 +0000
@@ -268,6 +268,14 @@
                     <max>64</max>
                     <precision>1</precision>
                 </option>
+                <option name="edge_responsiveness" type="float">
+                    <_short>Launcher Reveal Edge Responsiveness</_short>
+                    <_long>A conglomerate setting that modifies the overall responsiveness of the launcher reveal</_long>
+                    <default>1.0</default>
+                    <min>0.2</min>
+                    <max>8.0</max>
+                    <precision>0.1</precision>
+                </option>
                 <option name="reveal_pressure" type="int">
                     <_short>Launcher Reveal Pressure</_short>
                     <_long>Amount of mouse pressure required to reveal launcher</_long>