Merge lp:~brandontschaefer/unity/fix-915828 into lp:unity

[Brandon Schaefer]

Fixes the gtk-im-context not getting focused when the dash is opened. A signal from nux was removed causing this; couldn't find one to replace it. So using a property bool when the dash is about to show to call OnFocusIn(); when it is hiding OnFocusOut().

Not sure if I should have exposed those two functions in IMTextEntry.h, if that is not wanted I can add another property bool in IMTextEntry.cpp and use that focus in and out.

[Sam Spilsbury (smspillaz)]

Is it possible to make DashView, DashSearchBar and IMEntry use named constructors ? In that case, you can create an DashView and DashSearchBar shared ptr and then pass that to the IMEntry constructor, then assign the IMEntry object to the DashSearchBar.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Any updates ?

[Brandon Schaefer (brandontschaefer)]

Looking into a different signal to see if that can fix it. Also looking into a posisble nux fix. Else will look into using name constructors!

[Sam Spilsbury (smspillaz)]

Is this covered by tests already ?

review: Approve

[Brandon Schaefer (brandontschaefer)]

As of right now there are no test cases, and Im not sure how to automate this so Ill push a manual test.

[Thomi Richards (thomir-deactivatedaccount)]

This should be an autopilot test, not a manual test. This will be super-easy to write in autopilot. See the other tests in tests/autopilot/autopilot/tests/dash_tests.py for a hint as to how to write the test.

Cheers,

review: Needs Fixing

[Tim Penhey (thumper)]

Test will be added after. ibus support is critical.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/260/console reported an error when processing this lp:~brandontschaefer/unity/fix-915828 branch.
Not merging it.

[Tim Penhey (thumper)]

/home/tim/src/unity/hacking/plugins/unityshell/src/IMTextEntry.cpp: In constructor ‘unity::IMTextEntry::IMTextEntry()’:
/home/tim/src/unity/hacking/plugins/unityshell/src/IMTextEntry.cpp:49:3: error: ‘OnKeyNavFocusChange’ was not declared in this scope

Probably a trivial fix.

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

Sorry looks like that just got changed in nux to key_nav_focus_change. Submitting a fix soon!

[Tim Penhey (thumper)]

review: Approve

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-02-08 00:32:46 +0000
+++ manual-tests/Dash.txt	2012-02-13 10:17:18 +0000
@@ -67,3 +67,15 @@
   The text previously selected is pasted on the search bar at mouse pointer
   position, if the operation is repeated the text is inserted where
   the mouse pointer is.
+
+Dash SearchBar IBus Focus
+------------------------------
+This test shows that the IBus is getting focus when it gets keyboard focus.
+
+#. Open the Dash
+#. Press Ctrl + Space to activate ibus
+#. Type "abc1"
+
+Outcome
+  Typing "abc1" while ibus is focused will produce 阿布从 . If the ibus is not focused
+  then "abc1" will be the outcome (This is incorrect behavior).
 
=== modified file 'plugins/unityshell/src/IMTextEntry.cpp'
--- plugins/unityshell/src/IMTextEntry.cpp	2012-02-07 07:42:12 +0000
+++ plugins/unityshell/src/IMTextEntry.cpp	2012-02-13 10:17:18 +0000
@@ -46,6 +46,10 @@
   CheckIMEnabled();
   im_enabled ? SetupMultiIM() : SetupSimpleIM();
 
+  key_nav_focus_change.connect([&](nux::Area* area, bool focus, nux::KeyNavDirection dir) 
+  { 
+    focus ? OnFocusIn() : OnFocusOut();
+  }); 
   mouse_up.connect(sigc::mem_fun(this, &IMTextEntry::OnMouseButtonUp));
 }
 
 
=== modified file 'plugins/unityshell/src/IMTextEntry.h'
--- plugins/unityshell/src/IMTextEntry.h	2012-02-07 07:42:12 +0000
+++ plugins/unityshell/src/IMTextEntry.h	2012-02-13 10:17:18 +0000
@@ -66,6 +66,7 @@
 
   void OnFocusIn();
   void OnFocusOut();
+
   void UpdateCursorLocation();
 
   void OnMouseButtonUp(int x, int y, unsigned long bflags, unsigned long kflags);