Oxide

Merge lp:~osomon/oxide/fix-hasfocus into lp:~oxide-developers/oxide/oxide.trunk

  1. fix-hasfocus
  2. Merge into oxide.trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Chris Coulson
Approved revision: 1279
Merged at revision: 1279
Proposed branch: lp:~osomon/oxide/fix-hasfocus
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 12 lines (+1/-1)
1 file modified
qt/quick/api/oxideqquickwebview.cc (+1/-1)
To merge this branch: bzr merge lp:~osomon/oxide/fix-hasfocus
Reviewer Review Type Date Requested Status
Chris Coulson Pending
Review via email: mp+278164@code.launchpad.net

Commit message

Correctly report when the webview has actual active focus (check that its parent window is active).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qt/quick/api/oxideqquickwebview.cc'
2--- qt/quick/api/oxideqquickwebview.cc 2015-10-16 21:36:30 +0000
3+++ qt/quick/api/oxideqquickwebview.cc 2015-11-20 15:50:56 +0000
4@@ -326,7 +326,7 @@
5 bool OxideQQuickWebViewPrivate::HasFocus() const {
6 Q_Q(const OxideQQuickWebView);
7
8- return q->hasActiveFocus();
9+ return q->hasActiveFocus() && (q->window() ? q->window()->isActive() : false);
10 }
11
12 void OxideQQuickWebViewPrivate::AddMessageToConsole(

Subscribers

People subscribed via source and target branches