1
diff --git a/qt/quick/oxide_qquick_contents_view.cc b/qt/quick/oxide_qquick_contents_view.cc
2
index afa7525..cd4ba2c 100644
3
--- a/qt/quick/oxide_qquick_contents_view.cc
4
+++ b/qt/quick/oxide_qquick_contents_view.cc
5
@@ -104,8 +104,9 @@ bool ContentsView::IsVisible() const {
6
104
}
104
}
7
105
105
8
106
bool ContentsView::HasFocus() const {
106
bool ContentsView::HasFocus() const {
11
107
  return item_->hasActiveFocus() &&
107
  QQuickWindow* window = item_->window();
12
108
      (item_->window() ? item_->window()->isActive() : false);
108
  return window ? (window->isActive() &&
13
109
      (window->activeFocusItem() == item_)) : false;
14
109
}
110
}
15
110
111
16
111
QRect ContentsView::GetBounds() const {
112
QRect ContentsView::GetBounds() const {
17
diff --git a/qt/tests/qmltests/core/tst_focus.html b/qt/tests/qmltests/core/tst_focus.html
18
112
new file mode 100644
113
new file mode 100644
19
index 0000000..8e54900
20
--- /dev/null
21
+++ b/qt/tests/qmltests/core/tst_focus.html
22
@@ -0,0 +1,20 @@
23
1
<html>
24
2
<body>
25
3
<center>
26
4
  Enter your name: <input type="text" id="input" onfocusout="focusOff()"
27
5
  onfocusin="focusIn()" autofocus>
28
6
</center>
29
7
  <script>
30
8
    function focusOff() {
31
9
      var e = new CustomEvent("oxidefocusstate", { bubbles: true, detail: { status: false } });
32
10
      document.documentElement.dispatchEvent(e);
33
11
    }
34
12
35
13
    function focusIn() {
36
14
      var e = new CustomEvent("oxidefocusstate", { bubbles: true, detail: { status: true } });
37
15
      document.documentElement.dispatchEvent(e);
38
16
    }
39
17
  </script>
40
18
</body>
41
19
</html>
42
20
43
diff --git a/qt/tests/qmltests/core/tst_focus.qml b/qt/tests/qmltests/core/tst_focus.qml
44
0
new file mode 100644
21
new file mode 100644
45
index 0000000..d4b221e
46
--- /dev/null
47
+++ b/qt/tests/qmltests/core/tst_focus.qml
48
@@ -0,0 +1,66 @@
49
1
import QtQuick 2.0
50
2
import QtTest 1.0
51
3
import com.canonical.Oxide 1.0
52
4
import Oxide.testsupport 1.0
53
5
54
6
Item {
55
7
  id: root
56
8
  TestWebView {
57
9
    id: webView
58
10
59
11
    property bool htmlInputElementFocus: true;
60
12
    focus: true;
61
13
    messageHandlers: [
62
14
      ScriptMessageHandler {
63
15
        msgId: "FOCUS-STATE"
64
16
        contexts: [ "oxide://testutils/" ]
65
17
        callback: function(msg) {
66
18
          webView.htmlInputElementFocus = msg.payload;
67
19
        }
68
20
      }
69
21
    ]
70
22
  }
71
23
72
24
  TestCase {
73
25
    name: "webview_focus"
74
26
    when: windowShown
75
27
76
28
    function init() {
77
29
      webView.htmlInputElementFocus = true;
78
30
    }
79
31
80
32
    function cleanupTestCase() {
81
33
82
34
    }
83
35
84
36
    function test_initial_focus() {
85
37
      compare(webView.activeFocus, true, "webView.activeFocus == true");
86
38
    }
87
39
88
40
    function test_toggle_focus() {
89
41
      webView.url = "https://testsuite/tst_focus.html";
90
42
      verify(webView.waitForLoadSucceeded(),
91
43
             "Timed out waiting for successful load");
92
44
93
45
      compare(webView.activeFocus, true, "webView.activeFocus == true");
94
46
      compare(webView.htmlInputElementFocus, true, "webview.htmlInputElementFocus == true");
95
47
96
48
      webView.getTestApi().evaluateCode(
97
49
      "document.addEventListener(\"oxidefocusstate\", function(event) {
98
50
        oxide.sendMessage(\"FOCUS-STATE\", event.detail.status);
99
51
      });", true);
100
52
101
53
      webView.focus = false;
102
54
      TestUtils.waitFor(function() { return webView.activeFocus == false; });
103
55
      compare(webView.activeFocus, false, "webView.activeFocus == false");
104
56
      TestUtils.waitFor(function() { return webView.htmlInputElementFocus == false; });
105
57
      compare(webView.htmlInputElementFocus, false, "webview.htmlInputElementFocus == false");
106
58
107
59
      webView.focus = true;
108
60
      TestUtils.waitFor(function() { return webView.activeFocus == false; });
109
61
      compare(webView.activeFocus, true, "webView.activeFocus == true");
110
62
      TestUtils.waitFor(function() { return webView.htmlInputElementFocus == true; });
111
63
      compare(webView.htmlInputElementFocus, true, "webview.htmlInputElementFocus == true");
112
64
    }
113
65
  }
114
66
}
Reviewer	Review Type	Date Requested	Status
Chris Coulson		2016-07-29	Approve on 2016-09-19
Review via email: mp+301475@code.launchpad.net