git.iko.soy/unity8
on xenial help sign in
Replace wallpaper with static dash background and adapt styles to match design closer.
8e013a4Michał Sawicz
qml/Components/ListItems/Header.qml+1−12
compare with xenial
unifiedsplit
@@ -36,7 +36,7 @@ Item {
36 right: parent.right
36 right: parent.right
37 rightMargin: units.gu(0.5)
37 rightMargin: units.gu(0.5)
38 top: parent.top
38 top: parent.top
39− bottom: bottomBorder.top
39+ bottom: parent.bottom
40 }
40 }
41
41
42 Label {
42 Label {
@@ -53,8 +53,6 @@ Item {
53 fontSize: "medium"
53 fontSize: "medium"
54 elide: Text.ElideRight
54 elide: Text.ElideRight
55 textFormat: Text.PlainText
55 textFormat: Text.PlainText
56− style: Text.Raised
57− styleColor: "black"
58 width: parent.width - image.width - image.leftMargin - anchors.leftMargin
56 width: parent.width - image.width - image.leftMargin - anchors.leftMargin
59 }
57 }
60
58
@@ -68,15 +66,6 @@ Item {
68 }
66 }
69 }
67 }
70
68
71− ThinDivider {
72− id: bottomBorder
73− anchors {
74− left: parent.left
75− right: parent.right
76− bottom: parent.bottom
77− }
78− }
79−
80 MouseArea {
69 MouseArea {
81 anchors.fill: parent
70 anchors.fill: parent
82 onClicked: parent.clicked(mouse)
71 onClicked: parent.clicked(mouse)
qml/Dash/CardFilterGrid.qml+1−1
@@ -23,7 +23,7 @@ DashFilterGrid {
23 minimumHorizontalSpacing: units.gu(0.5)
23 minimumHorizontalSpacing: units.gu(0.5)
24 delegateWidth: cardTool.cardWidth
24 delegateWidth: cardTool.cardWidth
25 delegateHeight: cardTool.cardHeight
25 delegateHeight: cardTool.cardHeight
26− verticalSpacing: units.gu(2)
26+ verticalSpacing: units.gu(1)
27
27
28 CardTool {
28 CardTool {
29 id: cardTool
29 id: cardTool
qml/Dash/DashContent.qml+8
@@ -80,6 +80,14 @@ Item {
80 }
80 }
81 }
81 }
82
82
83+ Image {
84+ anchors.fill: parent
85+ source: shell.width > shell.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
86+ fillMode: Image.PreserveAspectCrop
87+ horizontalAlignment: Image.AlignRight
88+ verticalAlignment: Image.AlignTop
89+ }
90+
83 Item {
91 Item {
84 id: dashContentListHolder
92 id: dashContentListHolder
85 anchors.fill: parent
93 anchors.fill: parent
qml/Dash/DashFilterGrid.qml+1−1
@@ -26,6 +26,7 @@ DashRenderer {
26 property alias delegate: filterGrid.delegate
26 property alias delegate: filterGrid.delegate
27 property alias delegateWidth: filterGrid.delegateWidth
27 property alias delegateWidth: filterGrid.delegateWidth
28 property alias delegateHeight: filterGrid.delegateHeight
28 property alias delegateHeight: filterGrid.delegateHeight
29+ property alias verticalSpacing: filterGrid.verticalSpacing
29 property alias maximumNumberOfColumns: filterGrid.maximumNumberOfColumns
30 property alias maximumNumberOfColumns: filterGrid.maximumNumberOfColumns
30 property alias minimumHorizontalSpacing: filterGrid.minimumHorizontalSpacing
31 property alias minimumHorizontalSpacing: filterGrid.minimumHorizontalSpacing
31
32
@@ -40,7 +41,6 @@ DashRenderer {
40 height: filterGrid.height
41 height: filterGrid.height
41 margins: filterGrid.margins
42 margins: filterGrid.margins
42 uncollapsedHeight: filterGrid.uncollapsedHeight
43 uncollapsedHeight: filterGrid.uncollapsedHeight
43− verticalSpacing: filterGrid.verticalSpacing
44
44
45 function startFilterAnimation(filter) {
45 function startFilterAnimation(filter) {
46 filterGrid.startFilterAnimation(filter)
46 filterGrid.startFilterAnimation(filter)
qml/Dash/graphics/paper_landscape@27.pngnew file

Binary file not shown.

qml/Dash/graphics/paper_portrait@27.pngnew file

Binary file not shown.

qml/Shell.qml−30
@@ -125,27 +125,6 @@ FocusScope {
125 shell.background = gSettingsPicture
125 shell.background = gSettingsPicture
126 }
126 }
127
127
128− // This is a dummy image that is needed to determine if the picture url
129− // in backgroundSettings points to a valid picture file.
130− // We can't do this with the real background image because setting a
131− // new source in onStatusChanged triggers a binding loop detection
132− // inside Image, which causes it not to render even though a valid source
133− // would be set. We don't mind about this image staying black and just
134− // use it for verification to populate the source for the real
135− // background image.
136− Image {
137− source: shell.background
138− height: 0
139− width: 0
140− sourceSize.height: 0
141− sourceSize.width: 0
142− onStatusChanged: {
143− if (status == Image.Error && source != shell.defaultBackground) {
144− shell.background = defaultBackground
145− }
146− }
147− }
148−
149 VolumeControl {
128 VolumeControl {
150 id: volumeControl
129 id: volumeControl
151 }
130 }
@@ -174,15 +153,6 @@ FocusScope {
174 // through the translucent parts of the shell surface.
153 // through the translucent parts of the shell surface.
175 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
154 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
176
155
177− CrossFadeImage {
178− id: backgroundImage
179− objectName: "backgroundImage"
180−
181− anchors.fill: parent
182− source: shell.background
183− fillMode: Image.PreserveAspectCrop
184− }
185−
186 Rectangle {
156 Rectangle {
187 anchors.fill: parent
157 anchors.fill: parent
188 color: "black"
158 color: "black"