Merge lp:~michael-sheldon/oxide/input-focus-fix into lp:~oxide-developers/oxide/oxide.trunk

[Michael Sheldon]

Force Qt focus object changed events when the oxide focused node changes

Works around bug #1323743. After launching the browser via a call to Qt.openExternalUrl() from inside a webapp (e.g. by clicking a link in twitter) and then returning to the webapp, the keyboard stops appearing because the setFocusObject() method is no longer being called on the QInputContext (which is done internally by QGuiApplication). I'm still not clear on why this is the case, but this branch at least provides a work around by explicitly triggering a focus object changed event.

[lp:~michael-sheldon/oxide/input-focus-fix]

583. By Michael Sheldon on 2014-06-26

Merge from trunk

[Chris Coulson (chrisccoulson)]

Thanks!

review: Approve

=== modified file 'qt/core/browser/oxide_qt_render_widget_host_view.cc'
--- qt/core/browser/oxide_qt_render_widget_host_view.cc	2014-06-26 08:49:22 +0000
+++ qt/core/browser/oxide_qt_render_widget_host_view.cc	2014-06-26 11:07:37 +0000
@@ -817,6 +817,12 @@
   if (!HasFocus()) {
     return;
   }
+
+  // Work around for https://launchpad.net/bugs/1323743
+  if(QGuiApplication::focusWindow() && QGuiApplication::focusWindow()->focusObject()) {
+    QGuiApplication::focusWindow()->focusObjectChanged(QGuiApplication::focusWindow()->focusObject());
+  }
+
   delegate_->SetInputMethodEnabled(is_editable_node);
   if (QGuiApplication::inputMethod()->isVisible() != is_editable_node) {
     QGuiApplication::inputMethod()->setVisible(is_editable_node);