37d25d5 · unity8 · git.iko.soy

plugins/Dash/CardAttributes.qml+1

@@ -49,6 +49,7 @@ GridLayout {

49 Icon {

50 id: icon

51 height: units.gu(2)

52+ // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293

52 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth

53 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth

53 source: "icon" in modelData && modelData["icon"] || ""

54 source: "icon" in modelData && modelData["icon"] || ""

54 color: grid.color

55 color: grid.color

plugins/Dash/CardCreator.js+2

@@ -224,6 +224,8 @@ var kTitleLabelCode = 'Label { \n\

224

225// %1 is used as extra anchors of emblemIcon

226// %2 is used as color of emblemIcon

227+// FIXME The width code is a

228+// Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293

227var kEmblemIconCode = 'Icon { \n\

229var kEmblemIconCode = 'Icon { \n\

228 id: emblemIcon; \n\

230 id: emblemIcon; \n\

229 objectName: "emblemIcon"; \n\

231 objectName: "emblemIcon"; \n\

qml/Panel/IndicatorItem.qml+1

@@ -95,6 +95,7 @@ IndicatorDelegate {

95 id: itemImage

96 objectName: "icon"+index

97 height: iconHeight

98+ // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293

98 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;

99 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;

99 source: modelData

100 source: modelData

100 color: root.color

101 color: root.color