Merge lp:~bilalakhtar/unity/fix-queuedraw-after-addlaunchericon into lp:unity

[Bilal Akhtar]

Right now in Quantal, sometimes a SoftwareCenter launcher icon doesn't fly into the launcher when it should, and it waits for the next QueueDraw to happen. This doesn't happen all the time, and as such isn't reproducible easily. But even if it does happen, this branch should fix that.

[Sam Spilsbury (smspillaz)]

Tests?

review: Needs Information

[lp:~bilalakhtar/unity/fix-queuedraw-after-addlaunchericon]

2591. By Bilal Akhtar on 2012-08-24

Merge from trunk
'

2592. By Bilal Akhtar on 2012-08-24

Add autopilot test

[Bilal Akhtar (bilalakhtar)]

I added a test, thanks for the suggestion Sam!

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

Isn't better to do this on OnLauncherAddRequestSpecial when animating?

[Bilal Akhtar (bilalakhtar)]

Marco: No, because OnLauncherAddRequestSpecial isn't called until a QueueDraw is evoked. So if I remove this call, the call to OnLauncherAddRequestSpecial may not be made in some cases.

[Michal Hruby (mhr3)]

> Marco: No, because OnLauncherAddRequestSpecial isn't called until a QueueDraw
> is evoked. So if I remove this call, the call to OnLauncherAddRequestSpecial
> may not be made in some cases.

That really doesn't sound right, if that's the case, something is terribly broken.

[Bilal Akhtar (bilalakhtar)]

@Michal: Yes, it doesn't sound right because it's a workaround to an Intel Atom driver bug (see bug #981168). Just move the OnLauncherAddRequestSpecial call to the same place where we're calling QueueDraw right now, and boom, the launcher is broken for all Intel Atom netbooks.

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

Mh, this doesn't seem right btw... I've reworked the way this part work on a my upcoming branch, let's see if that would work there.

[Andrea Azzarone (azzar1)]

@Marco, @Bilal: is this branch still valid?

[Bilal Akhtar (bilalakhtar)]

It's valid but it isn't necessary anymore. The "add icon to launcher"
behavior has changed a lot and no longer needs this change.

On Wed, Nov 28, 2012 at 7:29 PM, Andrea Azzarone <email address hidden>wrote:

> @Marco, @Bilal: is this branch still valid?
> --
>
> https://code.launchpad.net/~bilalakhtar/unity/fix-queuedraw-after-addlaunchericon/+merge/120414
> You are the owner of
> lp:~bilalakhtar/unity/fix-queuedraw-after-addlaunchericon.
>

Unmerged revisions

2592. By Bilal Akhtar on 2012-08-24

Add autopilot test

2591. By Bilal Akhtar on 2012-08-24

Merge from trunk
'

2590. By Bilal Akhtar on 2012-08-20

Fix queuedraw after Software Center sends AddLauncherItemFromPosition to fix icon addition

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-08-21 17:50:55 +0000
+++ launcher/LauncherController.cpp	2012-08-24 13:03:20 +0000
@@ -1237,6 +1237,9 @@
                                       icon.Str(), icon_x, icon_y, icon_size);
 
     g_dbus_method_invocation_return_value(invocation, nullptr);
+
+    for (auto launcher : launchers)
+      launcher->QueueDraw();
   }
 }
 

=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2012-08-09 01:37:02 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2012-08-24 13:03:20 +0000
@@ -150,6 +150,32 @@
         self.assertThat(calc_icon, NotEquals(None))
         self.assertThat(calc_icon.visible, Eventually(Equals(True)))
 
+    def test_software_center_add_icon(self):
+        """ Test the ability to add a SoftwareCenterLauncherIcon """
+        sleep(.5)
+        
+        # Check if SC is pinned to the launcher already
+        icon = self.launcher.model.get_icon(desktop_id="ubuntu-software-center.desktop")
+        if icon != None:
+            self.launcher_instance.unlock_from_launcher(icon)
+            sleep(2.0)
+
+        self.launcher.add_launcher_item_from_position("Unity Test",
+                                                   "softwarecenter",
+                                                   100,
+                                                   100,
+                                                   32,
+                                                   "/usr/share/applications/ubuntu-software-center.desktop",
+                                                   "")
+        
+        sleep(2.0)
+
+        icon = self.launcher.model.get_icon(desktop_id="ubuntu-software-center.desktop")
+
+        # Check if the icon tooltip is NOT empty and NOT "waiting to install"
+        self.assertThat(icon.tooltip_text == "Waiting to install", Equals(False))
+        self.assertThat(len(icon.tooltip_text) == 0, Equals(False))
+        sleep(.5)
 
 class LauncherDragIconsBehavior(LauncherTestCase):
     """Tests dragging icons around the Launcher."""