Merge lp:~fuegofro/unity/unity into lp:unity

[Danny Weinberg]

Ensure sticky applications are shown before non-sticky applications in launcher. Previously the last sticky application would stay at the end of the list as more applications were opened. This prevents that from happening, ensuring that sticky applications are ordered properly at the beginning of the list, as expected. To test this, I logged out and back in and opened an application, making sure that the new application was placed after the sticky applications. This fixes bug 885937. The change can be found in revision 2374 of branch ~fuegofro/unity/unity

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

Thanks for your merge proposal. The fix looks good, but we need a test before this can be merged into Unity. Are you able to run the autopilot tests? If so, it should be reasonably easy to write an autopilot test that tests this code.

If you have any questions, feel free to ask me on IRC.

Cheers,

review: Needs Fixing

[Andrea Azzarone (azzar1)]

Ensure sticky applications are shown before non-sticky applications in launcher.

I'm not sure this is the wanted design.

review: Disapprove

Unmerged revisions

2375. By Danny Weinberg <email address hidden> on 2012-06-04

Merge

2374. By Danny Weinberg <email address hidden> on 2012-06-04

Ensure sticky applications are shown before non-sticky applications in launcher

=== modified file 'launcher/LauncherModel.cpp'
--- launcher/LauncherModel.cpp	2012-05-07 19:52:54 +0000
+++ launcher/LauncherModel.cpp	2012-06-04 02:04:24 +0000
@@ -80,6 +80,11 @@
   else if (first->GetIconType() > second->GetIconType())
     return false;
 
+  if (first->IsSticky() && !second->IsSticky())
+    return true;
+  else if (!first->IsSticky() && second->IsSticky())
+    return false;
+
   return first->SortPriority() < second->SortPriority();
 }