c40431f · unity8 · git.iko.soy

qml/Dash/DashPageHeader.qml+2

compare with xenial

unifiedsplit

@@ -18,6 +18,7 @@ import QtQuick 2.4

18import Ubuntu.Components 1.3

19import Ubuntu.Components.Popups 1.3

20import Ubuntu.Components.ListItems 1.3

21+import Utils 0.1

21import "../Components"

22import "../Components"

22

23

23Item {

24Item {

@@ -25,6 +26,7 @@ Item {

25 objectName: "pageHeader"

26 objectName: "pageHeader"

26 implicitHeight: headerContainer.height + signatureLineHeight

27 implicitHeight: headerContainer.height + signatureLineHeight

27 readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : 0

28 readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : 0

29+ readonly property real headerDividerLuminance: Style.luminance(bottomBorder.color)

28

30

29 property int activeFiltersCount: 0

31 property int activeFiltersCount: 0

30 property bool scopeHasFilters: false

32 property bool scopeHasFilters: false

qml/Dash/GenericScopeView.qml+1

@@ -722,6 +722,7 @@ FocusScope {

722 target: categoryView

723

724 readonly property real contentY: categoryView.contentY - categoryView.originY

725+ readonly property real headerDividerLuminance: categoryView.pageHeader.headerDividerLuminance

725 y: -contentY - units.gu(5)

726 y: -contentY - units.gu(5)

726

727

727 onRefresh: {

728 onRefresh: {

qml/Dash/PullToRefreshScopeStyle.qml+1

@@ -48,6 +48,7 @@ PullToRefreshStyle {

48 anchors.horizontalCenter: parent.horizontalCenter

49 horizontalAlignment: Text.AlignHCenter

50 verticalAlignment: Text.AlignVCenter

51+ color: styledItem.headerDividerLuminance < 0.3 ? "white" : theme.palette.normal.baseText

51 states: [

52 states: [

52 State {

53 State {

53 name: "pulling"

54 name: "pulling"