1
=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml'
2
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml	2013-09-06 13:50:32 +0000
3
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml	2013-09-20 14:28:00 +0000
4
@@ -39,8 +39,6 @@
5
39
    interactive: !selection.visible
39
    interactive: !selection.visible
6
40
    maximumFlickVelocity: height * 5
40
    maximumFlickVelocity: height * 5
7
41
41
8
42
    property real scale: experimental.test.contentsScale * experimental.test.devicePixelRatio
9
43
10
44
    /**
42
    /**
11
45
     * Client overridable function called before the default treatment of a
43
     * Client overridable function called before the default treatment of a
12
46
     *  valid navigation request. This function can stop the navigation request
44
     *  valid navigation request. This function can stop the navigation request
13
@@ -92,8 +90,7 @@
14
92
                    // and forward local URLs.
90
                    // and forward local URLs.
15
93
                    selection.mimedata.urls = data.images
91
                    selection.mimedata.urls = data.images
16
94
                }
92
                }
19
95
                selection.show(data.left * scale, data.top * scale,
93
                selection.show(data.left, data.top, data.width, data.height)
18
96
                               data.width * scale, data.height * scale)
20
97
            } else if (data.event === 'newtab') {
94
            } else if (data.event === 'newtab') {
21
98
                newTabRequested(data.url)
95
                newTabRequested(data.url)
22
99
            }
96
            }
23
@@ -147,10 +144,11 @@
24
147
        }
144
        }
25
148
145
26
149
        function show(x, y, width, height) {
146
        function show(x, y, width, height) {
31
150
            rect.x = x
147
            var scale = _webview.experimental.test.contentsScale * _webview.experimental.test.devicePixelRatio
32
151
            rect.y = y
148
            rect.x = x * scale + _webview.contentX
33
152
            rect.width = width
149
            rect.y = y * scale + _webview.contentY
34
153
            rect.height = height
150
            rect.width = width * scale
35
151
            rect.height = height * scale
36
154
            visible = true
152
            visible = true
37
155
            __showPopover()
153
            __showPopover()
38
156
        }
154
        }
39
@@ -166,11 +164,11 @@
40
166
            var message = new Object
164
            var message = new Object
41
167
            message.query = 'adjustselection'
165
            message.query = 'adjustselection'
42
168
            var rect = selection.rect
166
            var rect = selection.rect
48
169
            var scale = _webview.scale
167
            var scale = _webview.experimental.test.contentsScale * _webview.experimental.test.devicePixelRatio
49
170
            message.left = rect.x / scale
168
            message.left = (rect.x - _webview.contentX) / scale
50
171
            message.right = (rect.x + rect.width) / scale
169
            message.right = (rect.x + rect.width - _webview.contentX) / scale
51
172
            message.top = rect.y / scale
170
            message.top = (rect.y - _webview.contentY) / scale
52
173
            message.bottom = (rect.y + rect.height) / scale
171
            message.bottom = (rect.y + rect.height - _webview.contentY) / scale
53
174
            _webview.experimental.postMessage(JSON.stringify(message))
172
            _webview.experimental.postMessage(JSON.stringify(message))
54
175
        }
173
        }
55
176
174
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-09-23
Bill Filler (community)		2013-09-20	Approve on 2013-09-20
Review via email: mp+186808@code.launchpad.net