git.iko.soy/unity8
on xenial help sign in
Hook up divider color, move pagination dots above the divider.
37550faMichał Sawicz
qml/Dash/PageHeader.qml+21−21
compare with xenial
unifiedsplit
@@ -288,25 +288,6 @@ Item {
288 }
288 }
289 }
289 }
290
290
291− Row {
292− spacing: units.gu(.5)
293− Repeater {
294− objectName: "paginationRepeater"
295− model: root.paginationCount
296− Image {
297− objectName: "paginationDots_" + index
298− height: units.gu(1)
299− width: height
300− source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
301− }
302− }
303− anchors {
304− top: headerContainer.bottom
305− horizontalCenter: headerContainer.horizontalCenter
306− topMargin: units.gu(.5)
307− }
308− }
309−
310 Component {
291 Component {
311 id: popoverComponent
292 id: popoverComponent
312 Popover {
293 Popover {
@@ -344,7 +325,7 @@ Item {
344 }
325 }
345 }
326 }
346
327
347− BorderImage {
328+ Rectangle {
348 id: bottomBorder
329 id: bottomBorder
349 anchors {
330 anchors {
350 top: headerContainer.bottom
331 top: headerContainer.bottom
@@ -353,7 +334,26 @@ Item {
353 bottom: bottomContainer.top
334 bottom: bottomContainer.top
354 }
335 }
355
336
356− source: "graphics/PageHeaderBaseDivider.sci"
337+ color: scopeStyle ? scopeStyle.headerDividerColor : "#e0e0e0"
338+ }
339+
340+ Row {
341+ spacing: units.gu(.5)
342+ Repeater {
343+ objectName: "paginationRepeater"
344+ model: root.paginationCount
345+ Image {
346+ objectName: "paginationDots_" + index
347+ height: units.gu(1)
348+ width: height
349+ source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
350+ }
351+ }
352+ anchors {
353+ top: headerContainer.bottom
354+ horizontalCenter: headerContainer.horizontalCenter
355+ topMargin: units.gu(.5)
356+ }
357 }
357 }
358
358
359 Item {
359 Item {
qml/Dash/graphics/PageHeaderBaseDivider@18.pngdeleted

Binary file not shown.

qml/Dash/graphics/PageHeaderBaseDivider@18.scideleted−5
@@ -1,5 +0,0 @@
1−border.top: 4
2−border.bottom: 4
3−border.left: 0
4−border.right: 0
5−source: PageHeaderBaseDivider@18.png