← Back to branch summary

~zsombi/ubuntu-ui-toolkit/listitemSelectModeBugs

« back to all changes in this revision

Viewing changes to src/Ubuntu/Components/1.3/MainView.qml

  • Committer: Zsombor Egri
  • Date: 2015-11-16 06:35:05 UTC
  • mfrom: (1664.1.1 listitemSelectModeBugs)
  • Revision ID: zsombor.egri@canonical.com-20151116063505-cwn2qfks7qzk10g9
re-sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Components/1.3/MainView.qml
161
161
            panelColor: Qt.lighter(mainView.headerColor, 1.1)
162
162
 
163
163
            title: internal.activePage ? internal.activePage.title : ""
164
 
            flickable: internal.activePage ? internal.activePage.flickable : null
165
164
            pageStack: internal.activePage ? internal.activePage.pageStack : null
166
165
 
167
166
            contents: internal.activePage &&
173
172
                // Used when there is no active Page, or a Page 1.0 is used which
174
173
                // does not have a PageHeadConfiguration.
175
174
            }
176
 
            config: internal.activePage && internal.activePage.hasOwnProperty("head") ?
 
175
            config: visible && internal.activePage &&
 
176
                    internal.activePage.hasOwnProperty("head") ?
177
177
                        internal.activePage.head : defaultConfig
178
178
 
 
179
            // don't show the application header if the page has its own header.
 
180
            visible: !(internal.activePage &&
 
181
                       internal.activePage.hasOwnProperty("header") &&
 
182
                       internal.activePage.header)
 
183
 
 
184
            height: visible ? implicitHeight : 0
 
185
 
179
186
            // 'window' is defined by QML between startup and showing on the screen.
180
187
            // There is no signal for when it becomes available and re-declaring it is not safe.
181
188
            property bool windowActive: typeof window != 'undefined'
199
206
                    if (!(headerItem.config &&
200
207
                          headerItem.config.hasOwnProperty("locked") &&
201
208
                          headerItem.config.locked)) {
202
 
                        headerItem.show();
 
209
                        headerItem.exposed = true;
203
210
                    }
204
211
                }
205
212
            }