git.iko.soy/unity8
on xenial help sign in
Merge lp:~unity-team/unity8/tablePreviewWidget
commit0dc3bc439864e87bb22eadaf377deca3f3f3153b authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 15 Aug 2014, 14:44 (12 years ago) parentaa4a32fa20a649
3 files changed+27−3
compare with xenial
unifiedsplit
qml/Dash/DashNavigationList.qml+2−1 qml/Dash/PageHeader.qml+23 qml/Dash/Previews/PreviewTable.qml+2−2
qml/Dash/DashNavigationList.qml+2−1
@@ -31,7 +31,8 @@ Item {
3131 implicitHeight: flickable.contentHeight
3232
3333 Rectangle {
34− color: !root.scopeStyle || Qt.colorEqual(root.scopeStyle.background, "transparent") ? "white" : root.scopeStyle.background
34+ color: !root.scopeStyle || Qt.colorEqual(root.scopeStyle.background, "transparent") ?
35+ "white" : root.scopeStyle.navigationBackground
3536 anchors.fill: parent
3637 }
3738
qml/Dash/PageHeader.qml+23
@@ -335,6 +335,29 @@ Item {
335335 }
336336
337337 color: scopeStyle ? scopeStyle.headerDividerColor : "#e0e0e0"
338+
339+ Rectangle {
340+ anchors {
341+ top: parent.top
342+ left: parent.left
343+ right: parent.right
344+ }
345+ height: units.dp(1)
346+ color: Qt.darker(parent.color, 1.1)
347+ }
348+ }
349+
350+ Rectangle {
351+ anchors {
352+ top: bottomBorder.bottom
353+ left: parent.left
354+ right: parent.right
355+ }
356+ height: units.dp(1)
357+ opacity: 0.6
358+ color: scopeStyle ?
359+ Qt.lighter(Qt.rgba(scopeStyle.background.r, scopeStyle.background.g, scopeStyle.background.b, 1.0), 1.2) :
360+ "#CCFFFFFF"
338361 }
339362
340363 Row {
qml/Dash/Previews/PreviewTable.qml+2−2
@@ -47,7 +47,7 @@ PreviewWidget {
4747 }
4848 height: visible ? implicitHeight : 0
4949 fontSize: "large"
50− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
50+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
5151 visible: text !== ""
5252 opacity: .8
5353 text: widgetData["title"] || ""
@@ -70,7 +70,7 @@ PreviewWidget {
7070 fontSize: "small"
7171 text: perRowRepeater.model[index]
7272 visible: root.expanded || rowIndex < maximumCollapsedRowCount
73− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
73+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
7474 font.bold: index == 0
7575 }
7676 }