Merge lp:~3v1n0/unity/faster-launcher-options-updates into lp:unity

[Marco Trevisan (Treviño)]

LauncherOptions: use faster Idle and add super-tap-duration

Emit options has changed, when the launcher options have changed. So there is no delay while updating the options (mainly on startup).

[Marco Trevisan (Treviño) (3v1n0)]

Mh, I'm not sure this is the best thing since it bypasses the idle we have in LauncherOptions and that could be ok for the very first change, but the problem is that it also emits the option_changed signal when the values have been not really changed (even if compiz could handle it).

[Marco Trevisan (Treviño) (3v1n0)]

FYI, this is enough to fix this case: http://pastebin.ubuntu.com/5658122/

[Brandon Schaefer (brandontschaefer)]

Sweet, nice fix :). LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/537/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/537

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2013-03-14 18:55:36 +0000
+++ launcher/LauncherController.cpp	2013-03-29 17:02:22 +0000
@@ -119,7 +119,6 @@
   , keynav_restore_window_(true)
   , launcher_key_press_time_(0)
   , last_dnd_monitor_(-1)
-  , super_tap_duration_(0)
   , dbus_server_(DBUS_NAME)
 {
 #ifdef USE_X11
@@ -1055,7 +1054,7 @@
 }
 
 Controller::Controller(XdndManager::Ptr const& xdnd_manager)
- : options(Options::Ptr(new Options()))
+ : options(std::make_shared<Options>())
  , multiple_launchers(true)
  , pimpl(new Impl(this, xdnd_manager))
 {
@@ -1169,7 +1168,7 @@
 
     return false;
   };
-  pimpl->sources_.AddTimeout(pimpl->super_tap_duration_, show_launcher, local::KEYPRESS_TIMEOUT);
+  pimpl->sources_.AddTimeout(options()->super_tap_duration, show_launcher, local::KEYPRESS_TIMEOUT);
 
   auto show_shortcuts = [&]()
   {
@@ -1189,7 +1188,7 @@
 
 bool Controller::AboutToShowDash(int was_tap, int when) const
 {
-  if ((when - pimpl->launcher_key_press_time_) < pimpl->super_tap_duration_ && was_tap)
+  if ((when - pimpl->launcher_key_press_time_) < options()->super_tap_duration && was_tap)
     return true;
   return false;
 }
@@ -1197,7 +1196,7 @@
 void Controller::HandleLauncherKeyRelease(bool was_tap, int when)
 {
   int tap_duration = when - pimpl->launcher_key_press_time_;
-  if (tap_duration < pimpl->super_tap_duration_ && was_tap)
+  if (tap_duration < options()->super_tap_duration && was_tap)
   {
     LOG_DEBUG(logger) << "Quick tap, sending activation request.";
     pimpl->SendHomeActivationRequest();
@@ -1412,11 +1411,6 @@
   return false;
 }
 
-void Controller::UpdateSuperTapDuration(int const super_tap_duration)
-{
-  pimpl->super_tap_duration_ = super_tap_duration;
-}
-
 std::string
 Controller::GetName() const
 {
 
=== modified file 'launcher/LauncherController.h'
--- launcher/LauncherController.h	2013-02-14 17:22:08 +0000
+++ launcher/LauncherController.h	2013-03-29 17:02:22 +0000
@@ -82,8 +82,6 @@
 
   bool IsOverlayOpen() const;
 
-  void UpdateSuperTapDuration(int const super_tap_duration);
-
 protected:
   // Introspectable methods
   std::string GetName() const;
 
=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2013-03-06 13:13:37 +0000
+++ launcher/LauncherControllerPrivate.h	2013-03-29 17:02:22 +0000
@@ -145,7 +145,6 @@
   bool keynav_restore_window_;
   int launcher_key_press_time_;
   int last_dnd_monitor_;
-  int super_tap_duration_;
 
   glib::DBusServer dbus_server_;
   glib::SourceManager sources_;
 
=== modified file 'launcher/LauncherOptions.cpp'
--- launcher/LauncherOptions.cpp	2013-01-18 18:22:03 +0000
+++ launcher/LauncherOptions.cpp	2013-03-29 17:02:22 +0000
@@ -37,6 +37,7 @@
   , background_alpha(0.6667)
   , icon_size(48)
   , tile_size(54)
+  , super_tap_duration(250)
   , edge_decay_rate(1500)
   , edge_overcome_pressure(2000)
   , edge_stop_velocity(6500)
@@ -47,7 +48,8 @@
   , show_for_all(false)
 {
   auto changed_lambda = [this] {
-    changed_idle_.reset(new glib::Idle([this] { option_changed.emit(); return false; }));
+    changed_idle_.reset(new glib::Idle(glib::Source::Priority::HIGH));
+    changed_idle_->Run([this] { option_changed.emit(); return false; });
   };
 
   auto_hide_animation.changed.connect(sigc::hide(changed_lambda));
@@ -65,6 +67,7 @@
   launch_animation.changed.connect(sigc::hide(changed_lambda));
   reveal_trigger.changed.connect(sigc::hide(changed_lambda));
   tile_size.changed.connect(sigc::hide(changed_lambda));
+  super_tap_duration.changed.connect(sigc::hide(changed_lambda));
   urgent_animation.changed.connect(sigc::hide(changed_lambda));
   edge_resist.changed.connect(sigc::hide(changed_lambda));
 }
 
=== modified file 'launcher/LauncherOptions.h'
--- launcher/LauncherOptions.h	2013-01-18 18:22:03 +0000
+++ launcher/LauncherOptions.h	2013-03-29 17:02:22 +0000
@@ -93,6 +93,7 @@
   nux::Property<float> background_alpha;
   nux::Property<int> icon_size;
   nux::Property<int> tile_size;
+  nux::Property<int> super_tap_duration;
   nux::Property<int> edge_decay_rate;
   nux::Property<int> edge_overcome_pressure;
   nux::Property<int> edge_stop_velocity;
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-03-20 01:14:35 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-03-29 17:02:22 +0000
@@ -3076,7 +3076,7 @@
       PluginAdapter::Default().SetCoverageAreaBeforeAutomaximize(optionGetAutomaximizeValue() / 100.0f);
       break;
     case UnityshellOptions::DashTapDuration:
-      launcher_controller_->UpdateSuperTapDuration(optionGetDashTapDuration());
+      launcher_options->super_tap_duration = optionGetDashTapDuration();
       break;
     case UnityshellOptions::AltTabTimeout:
       switcher_controller_->SetDetailOnTimeout(optionGetAltTabTimeout());
@@ -3216,7 +3216,6 @@
   auto xdnd_manager = std::make_shared<XdndManagerImp>(xdnd_start_stop_notifier, xdnd_collection_window);
 
   launcher_controller_ = std::make_shared<launcher::Controller>(xdnd_manager);
-  launcher_controller_->UpdateSuperTapDuration(optionGetDashTapDuration());
   AddChild(launcher_controller_.get());
 
   switcher_controller_ = std::make_shared<switcher::Controller>();