← Back to branch summary

~josharenson/unity8/dash-refactor

« back to all changes in this revision

Viewing changes to qml/Dash/DashPageHeader.qml

  • Committer: Josh Arenson
  • Date: 2016-10-18 13:58:59 UTC
  • Revision ID: joshua.arenson@canonical.com-20161018135859-l7bo6nitay5an9xf
Fix signature line mess

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Dash/DashPageHeader.qml
128
128
        }
129
129
    }
130
130
 
 
131
    Rectangle {
 
132
        id: bottomBorder
 
133
        visible: showSignatureLine
 
134
        anchors {
 
135
            top: headerContainer.bottom
 
136
            left: parent.left
 
137
            right: parent.right
 
138
            bottom: parent.bottom
 
139
        }
 
140
 
 
141
        color: root.scopeStyle ? root.scopeStyle.headerDividerColor : "#e0e0e0"
 
142
 
 
143
        Rectangle {
 
144
            anchors {
 
145
                top: parent.top
 
146
                left: parent.left
 
147
                right: parent.right
 
148
            }
 
149
            height: units.dp(1)
 
150
            color: Qt.darker(parent.color, 1.1)
 
151
        }
 
152
    }
 
153
 
 
154
    Row {
 
155
        visible: bottomBorder.visible
 
156
        spacing: units.gu(.5)
 
157
        Repeater {
 
158
            objectName: "paginationRepeater"
 
159
            model: root.paginationCount
 
160
            Image {
 
161
                objectName: "paginationDots_" + index
 
162
                height: units.gu(1)
 
163
                width: height
 
164
                source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
 
165
            }
 
166
        }
 
167
        anchors {
 
168
            top: headerContainer.bottom
 
169
            horizontalCenter: headerContainer.horizontalCenter
 
170
            topMargin: units.gu(.5)
 
171
        }
 
172
    }
 
173
 
131
174
    Item {
132
175
        id: headerContainer
133
176
        objectName: "headerContainer"
199
242
 
200
243
                    activeFiltersCount: root.activeFiltersCount
201
244
                    categoryView: root.categoryView
 
245
                    extraPanelYOffset: root.signatureLineHeight
 
246
                    navigationTag: root.navigationTag
202
247
                    scope: root.scope
203
248
                    scopeView: root.scopeView
204
249
                    searchHistory: root.searchHistory
205
 
                    navigationTag: root.navigationTag
206
250
 
207
251
                    // PageHeader adds margins and that throws off the width
208
252
                    parentWidth: root.width
209
253
                    onCancelSearch: headerContainer.showSearch = showSearch;
210
254
                    onSearchTextFieldFocused: root.searchTextFieldFocused();
211
 
                    onShowSignatureLine: root.showSignatureLine = show;
212
255
 
213
256
                    Binding {
214
257
                        target: root
296
339
        }
297
340
    }
298
341
 
299
 
    Rectangle {
300
 
        id: bottomBorder
301
 
        visible: showSignatureLine
302
 
        anchors {
303
 
            top: headerContainer.bottom
304
 
            left: parent.left
305
 
            right: parent.right
306
 
            bottom: parent.bottom
307
 
        }
308
 
 
309
 
        color: root.scopeStyle ? root.scopeStyle.headerDividerColor : "#e0e0e0"
310
 
 
311
 
        Rectangle {
312
 
            anchors {
313
 
                top: parent.top
314
 
                left: parent.left
315
 
                right: parent.right
316
 
            }
317
 
            height: units.dp(1)
318
 
            color: Qt.darker(parent.color, 1.1)
319
 
        }
320
 
    }
321
 
 
322
 
    Row {
323
 
        visible: bottomBorder.visible
324
 
        spacing: units.gu(.5)
325
 
        Repeater {
326
 
            objectName: "paginationRepeater"
327
 
            model: root.paginationCount
328
 
            Image {
329
 
                objectName: "paginationDots_" + index
330
 
                height: units.gu(1)
331
 
                width: height
332
 
                source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
333
 
            }
334
 
        }
335
 
        anchors {
336
 
            top: headerContainer.bottom
337
 
            horizontalCenter: headerContainer.horizontalCenter
338
 
            topMargin: units.gu(.5)
339
 
        }
340
 
    }
341
 
 
342
342
    // FIXME this doesn't work with solid scope backgrounds due to z-ordering
343
343
    Item {
344
344
        id: bottomHighlight