git.iko.soy/unity8
on xenial help sign in
Merge lp:~aacid/unity8/new-scopes-dash-background-opacity
a5cfe89Albert Astals
qml/Dash/DashContent.qml−8
compare with xenial
unifiedsplit
@@ -80,14 +80,6 @@ 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−
91 Item {
83 Item {
92 id: dashContentListHolder
84 id: dashContentListHolder
93 anchors.fill: parent
85 anchors.fill: parent
qml/ScopeTool.qml+8
@@ -61,6 +61,14 @@ Rectangle {
61 color: "#FCFCFC"
61 color: "#FCFCFC"
62 }
62 }
63
63
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+
64 DashContent {
72 DashContent {
65 id: dashContent
73 id: dashContent
66
74
qml/Shell.qml+8
@@ -162,6 +162,14 @@ FocusScope {
162 opacity: dash.disappearingAnimationProgress
162 opacity: dash.disappearingAnimationProgress
163 }
163 }
164
164
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+
165 Dash {
173 Dash {
166 id: dash
174 id: dash
167 objectName: "dash"
175 objectName: "dash"