Merge lp:~azzar1/unity/fix-925021 into lp:unity

[Andrea Azzarone]

Inserting items into launcher makes unnecessary animations on other monitors

== Problem ==
Inserting items into launcher makes unnecessary animations on other monitors

== Fix ==
Derive SpacerLauncherIcon from SingleMonitorLauncherIcon.

== Test ==
SingleMonitorLauncherIcon is already tested.

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

This is fine and works, one thing that should improved is this case:
 1) Grab a launcher icon on monitor 1
 2) Drag it to the launcher on monitor 2

In that case, the SpacerLauncherIcon on monitor 1 should be removed, while a new one on monitor 2 should be added. Am I wrong?

[Andrea Azzarone (azzar1)]

Maybe you're right but you're talking about launcher icons and not dash icons. For launcher icons we don't add SpacerLauncherIcon :)

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

Yes, we add them. When reordering a launcher icon.

[Andrea Azzarone (azzar1)]

We add space but we do it without using SpacerLauncherIcon.

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

Code is good, works well. +1

review: Approve

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-03-26 17:35:23 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-03-26 17:35:23 +0000
@@ -2841,7 +2841,7 @@
     _drag_action = nux::DNDACTION_COPY;
     if (!_dnd_hovered_icon && hovered_icon_is_appropriate)
     {
-      _dnd_hovered_icon = new SpacerLauncherIcon();
+      _dnd_hovered_icon = new SpacerLauncherIcon(monitor());
       _dnd_hovered_icon->SetSortPriority(G_MAXINT);
       _model->AddIcon(_dnd_hovered_icon);
       _model->ReorderBefore(_dnd_hovered_icon, hovered_icon, true);
 
=== modified file 'plugins/unityshell/src/SpacerLauncherIcon.cpp'
--- plugins/unityshell/src/SpacerLauncherIcon.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/SpacerLauncherIcon.cpp	2012-03-26 17:35:23 +0000
@@ -27,8 +27,8 @@
 namespace launcher
 {
 
-SpacerLauncherIcon::SpacerLauncherIcon()
-  :   SimpleLauncherIcon()
+SpacerLauncherIcon::SpacerLauncherIcon(int monitor)
+  : SingleMonitorLauncherIcon(monitor)
 {
   SetQuirk(QUIRK_VISIBLE, true);
   SetQuirk(QUIRK_RUNNING, false);
 
=== modified file 'plugins/unityshell/src/SpacerLauncherIcon.h'
--- plugins/unityshell/src/SpacerLauncherIcon.h	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/SpacerLauncherIcon.h	2012-03-26 17:35:23 +0000
@@ -20,17 +20,17 @@
 #ifndef SPACERLAUNCHERICON_H
 #define SPACERLAUNCHERICON_H
 
-#include "SimpleLauncherIcon.h"
+#include "SingleMonitorLauncherIcon.h"
 
 namespace unity
 {
 namespace launcher
 {
 
-class SpacerLauncherIcon : public SimpleLauncherIcon
+class SpacerLauncherIcon : public SingleMonitorLauncherIcon
 {
 public:
-  SpacerLauncherIcon();
+  SpacerLauncherIcon(int monitor);
 
   bool IsSpacer()
   {