1
=== modified file 'Dash/Generic/GenericPreview.qml'
2
--- Dash/Generic/GenericPreview.qml	2013-08-09 10:06:19 +0000
3
+++ Dash/Generic/GenericPreview.qml	2013-08-16 09:08:14 +0000
4
@@ -74,25 +74,33 @@
5
74
        spacing: units.gu(2)
74
        spacing: units.gu(2)
6
75
75
7
76
        Label {
76
        Label {
8
77
            anchors { left: parent.left; right: parent.right }
9
77
            visible: text != ""
78
            visible: text != ""
10
78
            fontSize: "medium"
79
            fontSize: "medium"
11
79
            opacity: 0.6
80
            opacity: 0.6
12
80
            color: "white"
81
            color: "white"
14
81
            text: previewData.subtitle
82
            text: previewData.subtitle.replace(/[\r\n]+/g, "<br />")
15
82
            style: Text.Raised
83
            style: Text.Raised
16
83
            styleColor: "black"
84
            styleColor: "black"
17
84
            wrapMode: Text.WordWrap
85
            wrapMode: Text.WordWrap
18
86
            textFormat: Text.RichText
19
87
            // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
20
88
            onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
21
85
        }
89
        }
22
86
90
23
87
        Label {
91
        Label {
24
92
            anchors { left: parent.left; right: parent.right }
25
88
            visible: text != ""
93
            visible: text != ""
26
89
            fontSize: "small"
94
            fontSize: "small"
27
90
            opacity: 0.6
95
            opacity: 0.6
28
91
            color: "white"
96
            color: "white"
30
92
            text: previewData.description
97
            text: previewData.description.replace(/[\r\n]+/g, "<br />")
31
93
            style: Text.Raised
98
            style: Text.Raised
32
94
            styleColor: "black"
99
            styleColor: "black"
33
95
            wrapMode: Text.WordWrap
100
            wrapMode: Text.WordWrap
34
101
            textFormat: Text.RichText
35
102
            // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
36
103
            onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
37
96
        }
104
        }
38
97
    }
105
    }
39
98
}
106
}
Status:	Merged
Approved by:	Michał Sawicz on 2013-08-16
Approved revision:	193
Merged at revision:	210
Proposed branch:	lp:~saviq/unity8/fix-generic-preview
Merge into:	lp:unity8
Diff against target:	39 lines (+10/-2) 1 file modified Dash/Generic/GenericPreview.qml (+10/-2)
To merge this branch:	bzr merge lp:~saviq/unity8/fix-generic-preview
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-08-16
Albert Astals Cid (community)		2013-08-13	Approve on 2013-08-16
Review via email: mp+179932@code.launchpad.net