← Back to branch summary

~qqworini/ubuntu-rssreader-app/reboot-add-opml-support

« back to all changes in this revision

Viewing changes to shorts/qml/components/ArticleViewItem.qml

Manual merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shorts/qml/components/ArticleViewItem.qml
64
64
    ListView {
65
65
        id: rssListview
66
66
 
67
 
        property int contentFontSize: optionsKeeper.fontSize()
 
67
        property int contentFontSize: optionsKeeper.fontSize
68
68
 
69
69
        width: parent.width
70
70
        anchors {
78
78
        delegate: xmlDelegate
79
79
        snapMode: ListView.SnapOneItem
80
80
        cacheBuffer: 90 // value in pixels, for what?
81
 
        // boundsBehavior: Flickable.StopAtBounds
82
81
        orientation: ListView.Horizontal
83
82
        contentHeight: parent.width * count
84
83
        highlightFollowsCurrentItem: true
157
156
                    anchors.horizontalCenter: parent.horizontalCenter
158
157
                    spacing: units.gu(1)
159
158
 
160
 
                    Image {
 
159
                    Icon {
161
160
                        id: imgFavourite
162
 
                        anchors.verticalCenter: labelTime.verticalCenter
163
 
                        fillMode: Image.PreserveAspectCrop
164
 
                        source: Qt.resolvedUrl("/img/qml/icons/favorite-selected.svg")
165
 
                        sourceSize.height: modelItem == null ? 0 : (modelItem.favourite == "1" ? units.gu(2) : 0)
 
161
                        anchors {
 
162
                            top: parent.top
 
163
                            bottom: parent.bottom
 
164
                        }
 
165
                        name: "favorite-selected"
166
166
                        visible: modelItem == null ? false : (modelItem.favourite == "1")
167
 
                        smooth: true
168
167
                    }
169
168
 
170
169
                    Label {