← Back to branch summary

~brendan-donegan/unity8/shellRotationInvestigation

« back to all changes in this revision

Viewing changes to plugins/Dash/CardAttributes.qml

  • Committer: Mirco Müller
  • Date: 2015-03-06 14:22:41 UTC
  • mfrom: (1589.1.1 unity8)
  • Revision ID: mirco.mueller@ubuntu.com-20150306142241-wse3a2j2yghqfwoh
Merged kgunn's conflict-resolving branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Dash/CardAttributes.qml
49
49
            Icon {
50
50
                id: icon
51
51
                height: units.gu(2)
 
52
                // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
 
53
                width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
52
54
                source: "icon" in modelData && modelData["icon"] || ""
53
55
                color: grid.color
54
56
            }