Merge lp:~mial/ubuntu/oneiric/unity/bug-791810 into lp:unity

[Alberto Gatto]

This branch fixes Bug-791810. Compiz expose effect takes away the focus on a quicklist, i still don't know how and why it does that but i've placed a workaround in BamfLauncherIcon::OnViewPortSwitchEnded(). This is my first contribution so it may be lacking in all sort of ways, please feel free to address me if needed. Thank you so much for your work and excuse me for my poor english.

[Sebastien Bacher (seb128)]

Thank you for your work, it seems you based the merge request on the wrong vcs though seeing the diff, did you work on the upstream code or the unity packaging?

[Alberto Gatto (mial)]

First of all thank you for replying, i've worked on the code branched from
lp:unity i don't know what's the difference between upstream code and the
unity packaging; if it helps i've modified the code of unity as it was
suggested to me by Andrea Azzarone (andyrock).
I can redo the work on a different branch... just tell me. Thank you again
for your time.

AG

2011/11/10 Sebastien Bacher <email address hidden>

> Thank you for your work, it seems you based the merge request on the wrong
> vcs though seeing the diff, did you work on the upstream code or the unity
> packaging?
> --
>
> https://code.launchpad.net/~mial/ubuntu/oneiric/unity/bug-791 8810/+merge/80364<https://code.launchpad.net/~mial/ubuntu/oneiric/unity/bug-791810/+merge/80364>
> You are the owner of lp:~mial/ubuntu/oneiric/unity/bug-791810.
>

[Sebastien Bacher (seb128)]

Sorry for the delay between two replies, do you think you could update the merge request to target the correct vcs? you submitted against the packaging one there

[Alberto Gatto (mial)]

No problem at all... just point me to the right vcs if i'm not asking too
much, it would be of great help. I'll do the rest right now. Thanks again!

2011/11/24 Sebastien Bacher <email address hidden>

> Sorry for the delay between two replies, do you think you could update the
> merge request to target the correct vcs? you submitted against the
> packaging one there
> --
>
> https://code.launchpad.net/~mial/ubuntu/oneiric/unity/bug-791810/+merge/80364
> You are the owner of lp:~mial/ubuntu/oneiric/unity/bug-791810.
>

[Chris Halse Rogers (raof)]

Hi. The target for this merge request would be lp:unity - the branch that you based your work on. It's not possible (as far as I'm aware) to change the target of an existing merge request, so I'll ask for this one to be closed.

Please resubmit this merge request against lp:unity. Thanks for your work, and sorry for the delay in replying.

[Didier Roche-Tolomelli (didrocks)]

Hey, it seems you have text conflict in plugins/unityshell/src/BamfLauncherIcon.cp and generally, you should redo bzr branch lp:unity and include your fix there as there is no common history between the two branches.

Then, redo a merge proposal against lp:unity.

Thanks a lot for your work, and sorry for the confusion there :)

Unmerged revisions

1726. By Alberto Gatto on 2011-10-25

Removed a g_warning() that was only for testing purpose

1725. By Alberto Gatto on 2011-10-25

#Bug 791810

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-10-25 17:00:12 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-12-06 10:36:24 +0000
@@ -33,10 +33,20 @@
 
 #include <UnityCore/GLibWrapper.h>
 
+<<<<<<< TREE
 namespace unity
 {
 namespace launcher
 {
+=======
+/*
+* Needed to fix Bug-791810
+*/
+#include "QuicklistManager.h"
+#include "QuicklistView.h"
+
+using unity::FavoriteStore;
+>>>>>>> MERGE-SOURCE
 
 struct _ShortcutData
 {
@@ -395,6 +405,19 @@
 
 void BamfLauncherIcon::OnViewPortSwitchEnded()
 {
+  /*
+  * Workaround to reassign focus to the active quicklist after
+  * it got stolen during compiz expose.
+  * This fix solves Bug-791810.
+  */
+  QuicklistView* quicklist = QuicklistManager::Default()->Current();
+  if (quicklist != 0 && quicklist->IsVisible())
+  {
+    quicklist->GrabPointer();
+    quicklist->GrabKeyboard();
+    return;
+  }
+
   OnWindowMoved(0);
 }