1
=== modified file 'modules/Ubuntu/Components/MainView.qml'
2
--- modules/Ubuntu/Components/MainView.qml	2013-11-26 14:58:13 +0000
3
+++ modules/Ubuntu/Components/MainView.qml	2013-11-27 12:25:45 +0000
4
@@ -318,6 +318,16 @@
5
318
                      headerItem.contents.hasOwnProperty("alwaysSelectionMode") &&
318
                      headerItem.contents.hasOwnProperty("alwaysSelectionMode") &&
6
319
                      headerItem.contents.hasOwnProperty("selectedIndex")
319
                      headerItem.contents.hasOwnProperty("selectedIndex")
7
320
            }
320
            }
8
321
9
322
            Connections {
10
323
                // no connections are made when target is null
11
324
                target: headerItem.tabBar
12
325
                onSelectionModeChanged: {
13
326
                    if (headerItem.tabBar.selectionMode) {
14
327
                        if (!toolbarItem.locked) toolbarItem.close();
15
328
                    }
16
329
                }
17
330
            }
18
321
        }
331
        }
19
322
    }
332
    }
20
323
333
21
324
334
22
=== added file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
23
--- tests/unit_x11/tst_components/tst_hide_chrome.qml	1970-01-01 00:00:00 +0000
24
+++ tests/unit_x11/tst_components/tst_hide_chrome.qml	2013-11-27 12:25:45 +0000
25
@@ -0,0 +1,86 @@
26
1
/*
27
2
 * Copyright 2013 Canonical Ltd.
28
3
 *
29
4
 * This program is free software; you can redistribute it and/or modify
30
5
 * it under the terms of the GNU Lesser General Public License as published by
31
6
 * the Free Software Foundation; version 3.
32
7
 *
33
8
 * This program is distributed in the hope that it will be useful,
34
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
35
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
36
11
 * GNU Lesser General Public License for more details.
37
12
 *
38
13
 * You should have received a copy of the GNU Lesser General Public License
39
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
40
15
 */
41
16
42
17
import QtQuick 2.0
43
18
import QtTest 1.0
44
19
import Ubuntu.Components 0.1
45
20
46
21
Item {
47
22
    width: units.gu(50)
48
23
    height: units.gu(80)
49
24
50
25
    MainView {
51
26
        id: mainView
52
27
        anchors.fill: parent
53
28
        Tabs {
54
29
            id: tabs
55
30
            Tab {
56
31
                id: tab1
57
32
                title: "tab 1"
58
33
                page: Page {
59
34
                    id: page1
60
35
                    Button {
61
36
                        id: button
62
37
                        anchors.centerIn: parent
63
38
                        text: "click"
64
39
                    }
65
40
66
41
                    tools: ToolbarItems {
67
42
                        ToolbarButton {
68
43
                            text: "something"
69
44
                        }
70
45
                    }
71
46
                }
72
47
            }
73
48
            Tab {
74
49
                id: tab2
75
50
                title: "tab 2"
76
51
                page: Page {
77
52
                    id: page2
78
53
                }
79
54
            }
80
55
        }
81
56
    }
82
57
83
58
    TestCase {
84
59
        name: "HideChrome"
85
60
        when: windowShown
86
61
        id: testCase
87
62
88
63
        function openToolbar() {
89
64
            var toolbar = mainView.__propagated.toolbar;
90
65
            toolbar.open();
91
66
            compare(toolbar.opened, true, "Cannot open toolbar using open()");
92
67
            return toolbar;
93
68
        }
94
69
95
70
        function setTabBarSelectionMode(newSelectionMode) {
96
71
            var tabBar = tabs.tabBar;
97
72
            var header = mainView.__propagated.header;
98
73
            compare(tabBar, header.contents, "TabBar is not the active header contents");
99
74
            header.show();
100
75
            tabBar.selectionMode = newSelectionMode;
101
76
            return tabBar;
102
77
        }
103
78
104
79
        function test_tabBar_selectionMode_closes_toolbar_bug1223600() {
105
80
            testCase.setTabBarSelectionMode(false);
106
81
            var toolbar = testCase.openToolbar();
107
82
            testCase.setTabBarSelectionMode(true);
108
83
            compare(toolbar.opened, false, "Activating TabBar did not close toolbar");
109
84
        }
110
85
    }
111
86
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-11-27
Cris Dywan		2013-11-27	Approve on 2013-11-27
Review via email: mp+196864@code.launchpad.net