Merge lp:~brandontschaefer/unity/lp.1099815-fix into lp:unity

[Brandon Schaefer]

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

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/

Unmerged revisions

3257. By Brandon Schaefer on 2013-03-29

* When the launcher icon size has changed, emit that it has so we can update
  faster.

=== 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 02:19:22 +0000
@@ -3044,6 +3044,7 @@
 
       launcher_options->icon_size = optionGetIconSize();
       launcher_options->tile_size = optionGetIconSize() + 6;
+      launcher_options->option_changed.emit();
 
       hud_controller_->icon_size = launcher_options->icon_size();
       hud_controller_->tile_size = launcher_options->tile_size();