Merge lp:~aacid/unity8/new-scopes-dash-background-opacity
commita5cfe891d3cbb3c1e20c60d27bbf8cda7528d71d
authorAlbert Astals <albert.astals@canonical.com>
dateFri 14 Feb 2014, 16:56 (13 years ago)
parentcf4a478f5ee37c
qml/Dash/DashContent.qml−8
@@ -80,14 +80,6 @@ Item {
8080 }
8181 }
8282
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−
9183 Item {
9284 id: dashContentListHolder
9385 anchors.fill: parent
qml/ScopeTool.qml+8
@@ -61,6 +61,14 @@ Rectangle {
6161 color: "#FCFCFC"
6262 }
6363
64+ Image {
65+ anchors.fill: dashContent
66+ source: root.width > root.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
67+ fillMode: Image.PreserveAspectCrop
68+ horizontalAlignment: Image.AlignRight
69+ verticalAlignment: Image.AlignTop
70+ }
71+
6472 DashContent {
6573 id: dashContent
6674
qml/Shell.qml+8
@@ -162,6 +162,14 @@ FocusScope {
162162 opacity: dash.disappearingAnimationProgress
163163 }
164164
165+ Image {
166+ anchors.fill: dash
167+ source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
168+ fillMode: Image.PreserveAspectCrop
169+ horizontalAlignment: Image.AlignRight
170+ verticalAlignment: Image.AlignTop
171+ }
172+
165173 Dash {
166174 id: dash
167175 objectName: "dash"