Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/loview-partsview-dropshadow into lp:ubuntu-docviewer-app

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 268
Merged at revision: 270
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/loview-partsview-dropshadow
Merge into: lp:ubuntu-docviewer-app
Diff against target: 85 lines (+45/-12)
2 files modified
src/app/qml/loView/PartsView.qml (+40/-12)
src/app/qml/loView/graphics/dropshadow@27.sci (+5/-0)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/loview-partsview-dropshadow
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+282868@code.launchpad.net

Commit message

[loview] Added drop shadow effect to partsview thumbnails

Description of the change

[loview] Added drop shadow effect to partsview thumbnails

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/qml/loView/PartsView.qml'
--- src/app/qml/loView/PartsView.qml 2016-01-08 16:26:46 +0000
+++ src/app/qml/loView/PartsView.qml 2016-01-17 12:11:00 +0000
@@ -84,14 +84,28 @@
84 anchors.fill: parent84 anchors.fill: parent
8585
86 /* UITK 1.3 specs: Slot B */86 /* UITK 1.3 specs: Slot B */
87 Image {87 Item {
88 SlotsLayout.position: SlotsLayout.Leading88 SlotsLayout.position: SlotsLayout.Leading
89 height: parent.height; width: height89 height: parent.height; width: height
90 fillMode: Image.PreserveAspectFit90 BorderImage {
91 // Do not store a cache of the thumbnail, so that we don't show91 anchors {
92 // thumbnails of a previously loaded document.92 centerIn: parent
93 cache: true // TODO PLAY WITH IT93 verticalCenterOffset: units.gu(0.25)
94 source: model.thumbnail94 horizontalCenterOffset: units.gu(0.25)
95 }
96 width: vThumbnail.paintedWidth + units.gu(1.5)
97 height: vThumbnail.paintedHeight + units.gu(1.5)
98 source: "graphics/dropshadow.sci"
99 }
100 Image {
101 id: vThumbnail
102 anchors.fill: parent
103 fillMode: Image.PreserveAspectFit
104 // Do not store a cache of the thumbnail, so that we don't show
105 // thumbnails of a previously loaded document.
106 cache: true // TODO PLAY WITH IT
107 source: model.thumbnail
108 }
95 }109 }
96110
97 /* UITK 1.3 specs: Slot A */111 /* UITK 1.3 specs: Slot A */
@@ -139,14 +153,28 @@
139 }153 }
140 spacing: units.gu(0.5)154 spacing: units.gu(0.5)
141155
142 Image {156 Item {
143 Layout.fillWidth: true157 Layout.fillWidth: true
144 Layout.preferredHeight: width158 Layout.preferredHeight: width
145 fillMode: Image.PreserveAspectFit159 BorderImage {
146 // Do not store a cache of the thumbnail, so that we don't show160 anchors {
147 // thumbnails of a previously loaded document.161 centerIn: parent
148 cache: true // TODO PLAY WITH IT162 verticalCenterOffset: units.gu(0.25)
149 source: model.thumbnail163 horizontalCenterOffset: units.gu(0.25)
164 }
165 width: hThumbnail.paintedWidth + units.gu(1.5)
166 height: hThumbnail.paintedHeight + units.gu(1.5)
167 source: "graphics/dropshadow.sci"
168 }
169 Image {
170 id: hThumbnail
171 anchors.fill: parent
172 fillMode: Image.PreserveAspectFit
173 // Do not store a cache of the thumbnail, so that we don't show
174 // thumbnails of a previously loaded document.
175 cache: true // TODO PLAY WITH IT
176 source: model.thumbnail
177 }
150 }178 }
151179
152 Label {180 Label {
153181
=== added file 'src/app/qml/loView/graphics/dropshadow@27.png'
154Binary files src/app/qml/loView/graphics/dropshadow@27.png 1970-01-01 00:00:00 +0000 and src/app/qml/loView/graphics/dropshadow@27.png 2016-01-17 12:11:00 +0000 differ182Binary files src/app/qml/loView/graphics/dropshadow@27.png 1970-01-01 00:00:00 +0000 and src/app/qml/loView/graphics/dropshadow@27.png 2016-01-17 12:11:00 +0000 differ
=== added file 'src/app/qml/loView/graphics/dropshadow@27.sci'
--- src/app/qml/loView/graphics/dropshadow@27.sci 1970-01-01 00:00:00 +0000
+++ src/app/qml/loView/graphics/dropshadow@27.sci 2016-01-17 12:11:00 +0000
@@ -0,0 +1,5 @@
1border.left: 27
2border.top: 27
3border.bottom: 27
4border.right: 27
5source: dropshadow@27.png

Subscribers

People subscribed via source and target branches