1
=== modified file 'src/app/Browser.qml'
2
--- src/app/Browser.qml	2013-08-30 15:07:14 +0000
3
+++ src/app/Browser.qml	2013-09-12 09:14:52 +0000
4
@@ -170,7 +170,7 @@
5
170
            if (currentWebview) {
170
            if (currentWebview) {
6
171
                currentWebview.forceActiveFocus()
171
                currentWebview.forceActiveFocus()
7
172
            }
172
            }
9
173
            panel.item.opened = false
173
            panel.item.close()
10
174
        }
174
        }
11
175
    }
175
    }
12
176
176
13
@@ -198,7 +198,7 @@
14
198
                }
198
                }
15
199
                height: units.gu(8)
199
                height: units.gu(8)
16
200
200
18
201
                opened: true
201
                Component.onCompleted: open()
19
202
                onOpenedChanged: {
202
                onOpenedChanged: {
20
203
                    if (!opened) {
203
                    if (!opened) {
21
204
                        Qt.inputMethod.hide()
204
                        Qt.inputMethod.hide()
22
@@ -225,13 +225,13 @@
23
225
                    onLoadingChanged: {
225
                    onLoadingChanged: {
24
226
                        if (loading) {
226
                        if (loading) {
25
227
                            if (panel.item) {
227
                            if (panel.item) {
27
228
                                panel.item.opened = true
228
                                panel.item.open()
28
229
                            }
229
                            }
29
230
                        } else if (stopped) {
230
                        } else if (stopped) {
30
231
                            stopped = false
231
                            stopped = false
31
232
                        } else if (!addressBar.activeFocus) {
232
                        } else if (!addressBar.activeFocus) {
32
233
                            if (panel.item) {
233
                            if (panel.item) {
34
234
                                panel.item.opened = false
234
                                panel.item.close()
35
235
                            }
235
                            }
36
236
                            if (currentWebview) {
236
                            if (currentWebview) {
37
237
                                currentWebview.forceActiveFocus()
237
                                currentWebview.forceActiveFocus()
38
@@ -386,7 +386,7 @@
39
386
            if (!browser.chromeless) {
386
            if (!browser.chromeless) {
40
387
                if (!url) {
387
                if (!url) {
41
388
                    panel.chrome.addressBar.forceActiveFocus()
388
                    panel.chrome.addressBar.forceActiveFocus()
43
389
                    panel.item.opened = true
389
                    panel.item.open()
44
390
                }
390
                }
45
391
            }
391
            }
46
392
        }
392
        }
Status:	Merged
Merge reported by:	Olivier Tilloy
Merged at revision:	not available
Proposed branch:	lp:~osomon/webbrowser-app/new-panel-api
Merge into:	lp:webbrowser-app
Diff against target:	46 lines (+5/-5) 1 file modified src/app/Browser.qml (+5/-5)
To merge this branch:	bzr merge lp:~osomon/webbrowser-app/new-panel-api
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2013-09-20
Tim Peeters (community)		2013-09-12	Approve on 2013-09-12
Review via email: mp+185222@code.launchpad.net
1	=== modified file 'src/app/Browser.qml'
2	--- src/app/Browser.qml 2013-08-30 15:07:14 +0000
3	+++ src/app/Browser.qml 2013-09-12 09:14:52 +0000
4	@@ -170,7 +170,7 @@
5	170	if (currentWebview) {	170	if (currentWebview) {
6	171	currentWebview.forceActiveFocus()	171	currentWebview.forceActiveFocus()
7	172	}	172	}
9	173	panel.item.opened = false	173	panel.item.close()
10	174	}	174	}
11	175	}	175	}
12	176		176
13	@@ -198,7 +198,7 @@
14	198	}	198	}
15	199	height: units.gu(8)	199	height: units.gu(8)
16	200		200
18	201	opened: true	201	Component.onCompleted: open()
19	202	onOpenedChanged: {	202	onOpenedChanged: {
20	203	if (!opened) {	203	if (!opened) {
21	204	Qt.inputMethod.hide()	204	Qt.inputMethod.hide()
22	@@ -225,13 +225,13 @@
23	225	onLoadingChanged: {	225	onLoadingChanged: {
24	226	if (loading) {	226	if (loading) {
25	227	if (panel.item) {	227	if (panel.item) {
27	228	panel.item.opened = true	228	panel.item.open()
28	229	}	229	}
29	230	} else if (stopped) {	230	} else if (stopped) {
30	231	stopped = false	231	stopped = false
31	232	} else if (!addressBar.activeFocus) {	232	} else if (!addressBar.activeFocus) {
32	233	if (panel.item) {	233	if (panel.item) {
34	234	panel.item.opened = false	234	panel.item.close()
35	235	}	235	}
36	236	if (currentWebview) {	236	if (currentWebview) {
37	237	currentWebview.forceActiveFocus()	237	currentWebview.forceActiveFocus()
38	@@ -386,7 +386,7 @@
39	386	if (!browser.chromeless) {	386	if (!browser.chromeless) {
40	387	if (!url) {	387	if (!url) {
41	388	panel.chrome.addressBar.forceActiveFocus()	388	panel.chrome.addressBar.forceActiveFocus()
43	389	panel.item.opened = true	389	panel.item.open()
44	390	}	390	}
45	391	}	391	}
46	392	}	392	}