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
1=== modified file 'src/app/qml/loView/PartsView.qml'
2--- src/app/qml/loView/PartsView.qml 2016-01-08 16:26:46 +0000
3+++ src/app/qml/loView/PartsView.qml 2016-01-17 12:11:00 +0000
4@@ -84,14 +84,28 @@
5 anchors.fill: parent
6
7 /* UITK 1.3 specs: Slot B */
8- Image {
9+ Item {
10 SlotsLayout.position: SlotsLayout.Leading
11 height: parent.height; width: height
12- fillMode: Image.PreserveAspectFit
13- // Do not store a cache of the thumbnail, so that we don't show
14- // thumbnails of a previously loaded document.
15- cache: true // TODO PLAY WITH IT
16- source: model.thumbnail
17+ BorderImage {
18+ anchors {
19+ centerIn: parent
20+ verticalCenterOffset: units.gu(0.25)
21+ horizontalCenterOffset: units.gu(0.25)
22+ }
23+ width: vThumbnail.paintedWidth + units.gu(1.5)
24+ height: vThumbnail.paintedHeight + units.gu(1.5)
25+ source: "graphics/dropshadow.sci"
26+ }
27+ Image {
28+ id: vThumbnail
29+ anchors.fill: parent
30+ fillMode: Image.PreserveAspectFit
31+ // Do not store a cache of the thumbnail, so that we don't show
32+ // thumbnails of a previously loaded document.
33+ cache: true // TODO PLAY WITH IT
34+ source: model.thumbnail
35+ }
36 }
37
38 /* UITK 1.3 specs: Slot A */
39@@ -139,14 +153,28 @@
40 }
41 spacing: units.gu(0.5)
42
43- Image {
44+ Item {
45 Layout.fillWidth: true
46 Layout.preferredHeight: width
47- fillMode: Image.PreserveAspectFit
48- // Do not store a cache of the thumbnail, so that we don't show
49- // thumbnails of a previously loaded document.
50- cache: true // TODO PLAY WITH IT
51- source: model.thumbnail
52+ BorderImage {
53+ anchors {
54+ centerIn: parent
55+ verticalCenterOffset: units.gu(0.25)
56+ horizontalCenterOffset: units.gu(0.25)
57+ }
58+ width: hThumbnail.paintedWidth + units.gu(1.5)
59+ height: hThumbnail.paintedHeight + units.gu(1.5)
60+ source: "graphics/dropshadow.sci"
61+ }
62+ Image {
63+ id: hThumbnail
64+ anchors.fill: parent
65+ fillMode: Image.PreserveAspectFit
66+ // Do not store a cache of the thumbnail, so that we don't show
67+ // thumbnails of a previously loaded document.
68+ cache: true // TODO PLAY WITH IT
69+ source: model.thumbnail
70+ }
71 }
72
73 Label {
74
75=== added file 'src/app/qml/loView/graphics/dropshadow@27.png'
76Binary 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
77=== added file 'src/app/qml/loView/graphics/dropshadow@27.sci'
78--- src/app/qml/loView/graphics/dropshadow@27.sci 1970-01-01 00:00:00 +0000
79+++ src/app/qml/loView/graphics/dropshadow@27.sci 2016-01-17 12:11:00 +0000
80@@ -0,0 +1,5 @@
81+border.left: 27
82+border.top: 27
83+border.bottom: 27
84+border.right: 27
85+source: dropshadow@27.png

Subscribers

People subscribed via source and target branches