git.iko.soy/unity8
on xenial help sign in
tweaks to dash page header, updated bottom edge asset
6521e8eAndrea Cimitan
qml/Dash/Dash.qml+1−1
compare with xenial
unifiedsplit
@@ -329,7 +329,7 @@ Showable {
329 enabled: bottomEdgeController.progress == 0
329 enabled: bottomEdgeController.progress == 0
330 UbuntuNumberAnimation {}
330 UbuntuNumberAnimation {}
331 }
331 }
332− y: parent.height - height * (1 - bottomEdgeController.progress * 4)
332+ y: parent.height - height * (1 - bottomEdgeController.progress * 4) - units.gu(1)
333 MouseArea {
333 MouseArea {
334 // Eat direct presses on the overview hint so that they do not end up in the card below
334 // Eat direct presses on the overview hint so that they do not end up in the card below
335 anchors.fill: parent
335 anchors.fill: parent
qml/Dash/DashBackground.qml+2−11
@@ -15,16 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Window 2.2
19−import Ubuntu.Thumbnailer 0.1
20
18
21−Image {
19+Rectangle {
22− source: "image://thumbnailer/" + Qt.resolvedUrl("graphics/paper.png")
20+ color: "white"
23− fillMode: Image.PreserveAspectCrop
24− horizontalAlignment: Image.AlignRight
25− verticalAlignment: Image.AlignTop
26− // avoid CPU scaling when window size changes
27− readonly property int maxSize: Math.max(Screen.width, Screen.height)
28− sourceSize.width: maxSize
29− sourceSize.height: 0
30}
21}
qml/Dash/DashPageHeader.qml+8−41
@@ -412,39 +412,29 @@ Item {
412 }
412 }
413
413
414 Rectangle {
414 Rectangle {
415− id: bottomBorder
416− visible: showSignatureLine
417 anchors {
415 anchors {
418 top: headerContainer.bottom
416 top: headerContainer.bottom
419 left: parent.left
417 left: parent.left
420 right: parent.right
418 right: parent.right
421− bottom: parent.bottom
422− }
423−
424− color: root.scopeStyle ? root.scopeStyle.headerDividerColor : "#e0e0e0"
425−
426− Rectangle {
427− anchors {
428− top: parent.top
429− left: parent.left
430− right: parent.right
431− }
432− height: units.dp(1)
433− color: Qt.darker(parent.color, 1.1)
434 }
419 }
420+ height: units.dp(1)
421+ color: theme.palette.normal.base
435 }
422 }
436
423
437 Row {
424 Row {
438− visible: bottomBorder.visible
425+ visible: showSignatureLine
439 spacing: units.gu(.5)
426 spacing: units.gu(.5)
440 Repeater {
427 Repeater {
441 objectName: "paginationRepeater"
428 objectName: "paginationRepeater"
442 model: root.paginationCount
429 model: root.paginationCount
443− Image {
430+ Rectangle {
444 objectName: "paginationDots_" + index
431 objectName: "paginationDots_" + index
445 height: units.gu(1)
432 height: units.gu(1)
446 width: height
433 width: height
447− source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
434+ radius: height / 2
435+ color: index == root.paginationIndex ? UbuntuColors.blue : "transparent"
436+ border.width: index == root.paginationIndex ? 0 : units.dp(1)
437+ border.color: theme.palette.normal.baseText
448 }
438 }
449 }
439 }
450 anchors {
440 anchors {
@@ -453,27 +443,4 @@ Item {
453 topMargin: units.gu(.5)
443 topMargin: units.gu(.5)
454 }
444 }
455 }
445 }
456−
457− // FIXME this doesn't work with solid scope backgrounds due to z-ordering
458− Item {
459− id: bottomHighlight
460− visible: bottomBorder.visible
461− anchors {
462− top: parent.bottom
463− left: parent.left
464− right: parent.right
465− }
466− z: 1
467− height: units.dp(1)
468− opacity: 0.6
469−
470− Rectangle {
471− anchors.fill: parent
472− color: if (root.scopeStyle) {
473− Qt.lighter(Qt.rgba(root.scopeStyle.background.r,
474− root.scopeStyle.background.g,
475− root.scopeStyle.background.b, 1.0), 1.2);
476− } else "#CCFFFFFF"
477− }
478− }
479}
446}
qml/Dash/graphics/overview_hint@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/pagination_dot_off@30.pngdeleted

Binary file not shown.

qml/Dash/graphics/pagination_dot_on@30.pngdeleted

Binary file not shown.

qml/Dash/graphics/paper.pngdeleted

Binary file not shown.