git.iko.soy/unity8
on xenial help sign in
No signature line by default in dashPageHeader
a306a83Andrea Cimitan
qml/Dash/DashPageHeader.qml+8−7
compare with xenial
unifiedsplit
@@ -25,7 +25,7 @@ Item {
25 id: root
25 id: root
26 objectName: "pageHeader"
26 objectName: "pageHeader"
27 implicitHeight: headerContainer.height + signatureLineHeight
27 implicitHeight: headerContainer.height + signatureLineHeight
28− readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : 0
28+ readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : headerBottomLine.height
29 readonly property real headerDividerLuminance: Style.luminance(bottomBorder.color)
29 readonly property real headerDividerLuminance: Style.luminance(bottomBorder.color)
30
30
31 property int activeFiltersCount: 0
31 property int activeFiltersCount: 0
@@ -44,7 +44,7 @@ Item {
44 property ListModel searchHistory
44 property ListModel searchHistory
45 property alias searchQuery: searchTextField.text
45 property alias searchQuery: searchTextField.text
46 property alias searchHint: searchTextField.placeholderText
46 property alias searchHint: searchTextField.placeholderText
47− property bool showSignatureLine: true
47+ property bool showSignatureLine: false
48
48
49 property int paginationCount: 0
49 property int paginationCount: 0
50 property int paginationIndex: -1
50 property int paginationIndex: -1
@@ -414,6 +414,7 @@ Item {
414 }
414 }
415
415
416 Rectangle {
416 Rectangle {
417+ id: headerBottomLine
417 anchors {
418 anchors {
418 top: headerContainer.bottom
419 top: headerContainer.bottom
419 left: parent.left
420 left: parent.left
@@ -424,6 +425,11 @@ Item {
424 }
425 }
425
426
426 Row {
427 Row {
428+ anchors {
429+ top: headerContainer.bottom
430+ horizontalCenter: headerContainer.horizontalCenter
431+ topMargin: units.gu(.5)
432+ }
427 visible: showSignatureLine
433 visible: showSignatureLine
428 spacing: units.gu(.5)
434 spacing: units.gu(.5)
429 Repeater {
435 Repeater {
@@ -439,10 +445,5 @@ Item {
439 border.color: theme.palette.normal.baseText
445 border.color: theme.palette.normal.baseText
440 }
446 }
441 }
447 }
442− anchors {
443− top: headerContainer.bottom
444− horizontalCenter: headerContainer.horizontalCenter
445− topMargin: units.gu(.5)
446− }
447 }
448 }
448}
449}
qml/Dash/GenericScopeView.qml+1
@@ -644,6 +644,7 @@ FocusScope {
644 scopeHasFilters: scopeView.scope.filters != null
644 scopeHasFilters: scopeView.scope.filters != null
645 activeFiltersCount: scopeView.scope.activeFiltersCount
645 activeFiltersCount: scopeView.scope.activeFiltersCount
646 showBackButton: scopeView.hasBackAction
646 showBackButton: scopeView.hasBackAction
647+ showSignatureLine: !showBackButton
647 searchEntryEnabled: true
648 searchEntryEnabled: true
648 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
649 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
649 favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
650 favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"