1
=== modified file 'qml/Dash/Dash.qml'
2
--- qml/Dash/Dash.qml	2016-05-02 07:57:07 +0000
3
+++ qml/Dash/Dash.qml	2016-10-14 09:08:35 +0000
4
@@ -329,7 +329,7 @@
5
329
            enabled: bottomEdgeController.progress == 0
329
            enabled: bottomEdgeController.progress == 0
6
330
            UbuntuNumberAnimation {}
330
            UbuntuNumberAnimation {}
7
331
        }
331
        }
9
332
        y: parent.height - height * (1 - bottomEdgeController.progress * 4)
332
        y: parent.height - height * (1 - bottomEdgeController.progress * 4) - units.gu(1)
10
333
        MouseArea {
333
        MouseArea {
11
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
12
335
            anchors.fill: parent
335
            anchors.fill: parent
13
336
336
14
=== modified file 'qml/Dash/DashBackground.qml'
15
--- qml/Dash/DashBackground.qml	2016-08-30 14:06:47 +0000
16
+++ qml/Dash/DashBackground.qml	2016-10-14 09:08:35 +0000
17
@@ -15,16 +15,7 @@
18
15
 */
15
 */
19
16
16
20
17
import QtQuick 2.4
17
import QtQuick 2.4
21
18
import QtQuick.Window 2.2
22
19
import ImageCache 0.1
23
20
18
33
21
Image {
19
Rectangle {
34
22
    source: "image://unity8imagecache/" + Qt.resolvedUrl("graphics/paper.png")
20
    color: "white"
26
23
    fillMode: Image.PreserveAspectCrop
27
24
    horizontalAlignment: Image.AlignRight
28
25
    verticalAlignment: Image.AlignTop
29
26
    // avoid CPU scaling when window size changes
30
27
    readonly property int maxSize: Math.max(Screen.width, Screen.height)
31
28
    sourceSize.width: maxSize
32
29
    sourceSize.height: 0
35
30
}
21
}
36
31
22
37
=== modified file 'qml/Dash/DashPageHeader.qml'
38
--- qml/Dash/DashPageHeader.qml	2016-08-16 14:06:26 +0000
39
+++ qml/Dash/DashPageHeader.qml	2016-10-14 09:08:35 +0000
40
@@ -25,7 +25,7 @@
41
25
    id: root
25
    id: root
42
26
    objectName: "pageHeader"
26
    objectName: "pageHeader"
43
27
    implicitHeight: headerContainer.height + signatureLineHeight
27
    implicitHeight: headerContainer.height + signatureLineHeight
45
28
    readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : 0
28
    readonly property real signatureLineHeight: showSignatureLine ? units.gu(2.5) : headerBottomLine.height
46
29
    readonly property real headerDividerLuminance: Style.luminance(bottomBorder.color)
29
    readonly property real headerDividerLuminance: Style.luminance(bottomBorder.color)
47
30
30
48
31
    property int activeFiltersCount: 0
31
    property int activeFiltersCount: 0
49
@@ -44,7 +44,7 @@
50
44
    property ListModel searchHistory
44
    property ListModel searchHistory
51
45
    property alias searchQuery: searchTextField.text
45
    property alias searchQuery: searchTextField.text
52
46
    property alias searchHint: searchTextField.placeholderText
46
    property alias searchHint: searchTextField.placeholderText
54
47
    property bool showSignatureLine: true
47
    property bool showSignatureLine: false
55
48
48
56
49
    property int paginationCount: 0
49
    property int paginationCount: 0
57
50
    property int paginationIndex: -1
50
    property int paginationIndex: -1
58
@@ -414,68 +414,36 @@
59
414
    }
414
    }
60
415
415
61
416
    Rectangle {
416
    Rectangle {
63
417
        id: bottomBorder
417
        id: headerBottomLine
64
418
        anchors {
65
419
            top: headerContainer.bottom
66
420
            left: parent.left
67
421
            right: parent.right
68
422
        }
69
423
        height: units.dp(1)
70
424
        color: theme.palette.normal.base
71
425
    }
72
426
73
427
    Row {
74
428
        anchors {
75
429
            top: headerContainer.bottom
76
430
            horizontalCenter: headerContainer.horizontalCenter
77
431
            topMargin: units.gu(1)
78
432
        }
79
418
        visible: showSignatureLine
433
        visible: showSignatureLine
80
419
        anchors {
81
420
            top: headerContainer.bottom
82
421
            left: parent.left
83
422
            right: parent.right
84
423
            bottom: parent.bottom
85
424
        }
86
425
87
426
        color: root.scopeStyle ? root.scopeStyle.headerDividerColor : "#e0e0e0"
88
427
89
428
        Rectangle {
90
429
            anchors {
91
430
                top: parent.top
92
431
                left: parent.left
93
432
                right: parent.right
94
433
            }
95
434
            height: units.dp(1)
96
435
            color: Qt.darker(parent.color, 1.1)
97
436
        }
98
437
    }
99
438
100
439
    Row {
101
440
        visible: bottomBorder.visible
102
441
        spacing: units.gu(.5)
434
        spacing: units.gu(.5)
103
442
        Repeater {
435
        Repeater {
104
443
            objectName: "paginationRepeater"
436
            objectName: "paginationRepeater"
105
444
            model: root.paginationCount
437
            model: root.paginationCount
107
445
            Image {
438
            Rectangle {
108
446
                objectName: "paginationDots_" + index
439
                objectName: "paginationDots_" + index
109
447
                height: units.gu(1)
440
                height: units.gu(1)
110
448
                width: height
441
                width: height
112
449
                source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
442
                radius: height / 2
113
443
                color: index == root.paginationIndex ? UbuntuColors.blue : "transparent"
114
444
                border.width: index == root.paginationIndex ? 0 : 1 // yes, one pixel and not 1dp
115
445
                border.color: theme.palette.normal.baseText
116
450
            }
446
            }
117
451
        }
447
        }
118
452
        anchors {
119
453
            top: headerContainer.bottom
120
454
            horizontalCenter: headerContainer.horizontalCenter
121
455
            topMargin: units.gu(.5)
122
456
        }
123
457
    }
124
458
125
459
    // FIXME this doesn't work with solid scope backgrounds due to z-ordering
126
460
    Item {
127
461
        id: bottomHighlight
128
462
        visible: bottomBorder.visible
129
463
        anchors {
130
464
            top: parent.bottom
131
465
            left: parent.left
132
466
            right: parent.right
133
467
        }
134
468
        z: 1
135
469
        height: units.dp(1)
136
470
        opacity: 0.6
137
471
138
472
        Rectangle {
139
473
            anchors.fill: parent
140
474
            color: if (root.scopeStyle) {
141
475
                       Qt.lighter(Qt.rgba(root.scopeStyle.background.r,
142
476
                                          root.scopeStyle.background.g,
143
477
                                          root.scopeStyle.background.b, 1.0), 1.2);
144
478
                   } else "#CCFFFFFF"
145
479
        }
146
480
    }
448
    }
147
481
}
449
}
148
482
450
149
=== modified file 'qml/Dash/GenericScopeView.qml'
150
--- qml/Dash/GenericScopeView.qml	2016-09-22 07:37:21 +0000
151
+++ qml/Dash/GenericScopeView.qml	2016-10-14 09:08:35 +0000
152
@@ -644,6 +644,7 @@
153
644
            scopeHasFilters: scopeView.scope.filters != null
644
            scopeHasFilters: scopeView.scope.filters != null
154
645
            activeFiltersCount: scopeView.scope.activeFiltersCount
645
            activeFiltersCount: scopeView.scope.activeFiltersCount
155
646
            showBackButton: scopeView.hasBackAction
646
            showBackButton: scopeView.hasBackAction
156
647
            showSignatureLine: !showBackButton
157
647
            searchEntryEnabled: true
648
            searchEntryEnabled: true
158
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
159
649
            favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
650
            favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
160
650
651
161
=== removed file 'qml/Dash/graphics/overview_hint@27.png'
162
651
Binary files qml/Dash/graphics/overview_hint@27.png	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/overview_hint@27.png	1970-01-01 00:00:00 +0000 differ
652
Binary files qml/Dash/graphics/overview_hint@27.png	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/overview_hint@27.png	1970-01-01 00:00:00 +0000 differ
163
=== added file 'qml/Dash/graphics/overview_hint@30.png'
164
652
Binary files qml/Dash/graphics/overview_hint@30.png	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/overview_hint@30.png	2016-10-14 09:08:35 +0000 differ
653
Binary files qml/Dash/graphics/overview_hint@30.png	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/overview_hint@30.png	2016-10-14 09:08:35 +0000 differ
165
=== removed file 'qml/Dash/graphics/pagination_dot_off@30.png'
166
653
Binary files qml/Dash/graphics/pagination_dot_off@30.png	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/pagination_dot_off@30.png	1970-01-01 00:00:00 +0000 differ
654
Binary files qml/Dash/graphics/pagination_dot_off@30.png	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/pagination_dot_off@30.png	1970-01-01 00:00:00 +0000 differ
167
=== removed file 'qml/Dash/graphics/pagination_dot_on@30.png'
168
654
Binary files qml/Dash/graphics/pagination_dot_on@30.png	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/pagination_dot_on@30.png	1970-01-01 00:00:00 +0000 differ
655
Binary files qml/Dash/graphics/pagination_dot_on@30.png	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/pagination_dot_on@30.png	1970-01-01 00:00:00 +0000 differ
169
=== removed file 'qml/Dash/graphics/paper.png'
170
655
Binary files qml/Dash/graphics/paper.png	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/paper.png	1970-01-01 00:00:00 +0000 differ
656
Binary files qml/Dash/graphics/paper.png	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/paper.png	1970-01-01 00:00:00 +0000 differ
171
=== modified file 'tests/qmltests/Dash/tst_DashPageHeader.qml'
172
--- tests/qmltests/Dash/tst_DashPageHeader.qml	2016-08-03 15:51:32 +0000
173
+++ tests/qmltests/Dash/tst_DashPageHeader.qml	2016-10-14 09:08:35 +0000
174
@@ -173,9 +173,9 @@
175
173
                for (var j=0; j<paginationRepeater.count; j++) {
173
                for (var j=0; j<paginationRepeater.count; j++) {
176
174
                    var paginationDot = findChild(pageHeader, "paginationDots_"+j);
174
                    var paginationDot = findChild(pageHeader, "paginationDots_"+j);
177
175
                    if (i==j) {
175
                    if (i==j) {
179
176
                        compare(paginationDot.source.toString().indexOf("pagination_dot_on") > -1, true);
176
                        compare(paginationDot.color, UbuntuColors.blue);
180
177
                    } else {
177
                    } else {
182
178
                        compare(paginationDot.source.toString().indexOf("pagination_dot_off") > -1, true);
178
                        compare(paginationDot.color.a, 0);
183
179
                    }
179
                    }
184
180
                }
180
                }
185
181
            }
181
            }
186
182
182
187
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
188
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-09-22 07:41:49 +0000
189
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-10-14 09:08:35 +0000
190
@@ -485,7 +485,7 @@
191
485
                mouseClick(seeAll0);
485
                mouseClick(seeAll0);
192
486
                verify(category0.expanded);
486
                verify(category0.expanded);
193
487
                tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
487
                tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
195
488
                tryCompare(genericScopeView.categoryView, "contentY", units.gu(8));
488
                tryCompare(genericScopeView.categoryView, "contentY", units.gu(8.5));
196
489
489
197
490
                scrollToEnd();
490
                scrollToEnd();
198
491
491
Status:	Merged
Approved by:	Albert Astals Cid on 2016-10-14
Approved revision:	2610
Merged at revision:	2675
Proposed branch:	lp:~cimi/unity8/dash-visual-tweaks_pageHeader-bottomEdge
Merge into:	lp:unity8
Diff against target:	197 lines (+30/-70) 6 files modified qml/Dash/Dash.qml (+1/-1) qml/Dash/DashBackground.qml (+2/-11) qml/Dash/DashPageHeader.qml (+23/-55) qml/Dash/GenericScopeView.qml (+1/-0) tests/qmltests/Dash/tst_DashPageHeader.qml (+2/-2) tests/qmltests/Dash/tst_GenericScopeView.qml (+1/-1)
To merge this branch:	bzr merge lp:~cimi/unity8/dash-visual-tweaks_pageHeader-bottomEdge
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-10-14
Albert Astals Cid (community)		2016-09-02	Approve on 2016-10-14
Review via email: mp+304798@code.launchpad.net