← Back to branch summary

~ci-train-bot/unity8/ubuntu-rtm-14.09-proposed

« back to all changes in this revision

Viewing changes to plugins/Dash/CardAttributes.qml

  • Committer: CI Train Bot
  • Date: 2015-02-17 10:47:13 UTC
  • mfrom: (1417.1.8 rtm-20150213)
  • Revision ID: ci-train-bot@canonical.com-20150217104713-hk18a30hnrqjob9c
https://launchpad.net/bugs/1334855
https://launchpad.net/bugs/1355422
https://launchpad.net/bugs/1393008
https://launchpad.net/bugs/1411748
* Preserve the aspect ratio for the card attribute images
* support background on horizontal cards with summary (LP: #1393008)
* Background needs to be specified to be visible in horizontal cards
(LP: #1411748)
* Don't show() the lockscreen if it's already being shown
* Create a PhysicalKeyMapper to handle all physical/hardware keys
* Create a PhysicalKeyMapper to handle all physical/hardware keys
* Allow swipe-to-dismiss for contracted snap-decision notifications,
  interactive notifications and ephemeral notifications. (LP:
  #1355422, #1334855)

Show diffs side-by-side

added added

removed removed

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