c4bfea4 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Some overlay height fixes

c4bfea4Albert Astals12 years ago

plugins/Dash/CardCreator.js+26−21

compare with xenial

unifiedsplit

@@ -30,6 +30,7 @@ function createCardComponent(parent, template, components) {

30 property var cardData; \

31 property real fontScale: 1.0; \

32 property int headerAlignment: Text.AlignLeft; \

33+ property int fixedHeaderHeight: -1; \

33 property size fixedArtShapeSize: Qt.size(-1, -1); \

34 property size fixedArtShapeSize: Qt.size(-1, -1); \

34 readonly property string title: cardData && cardData["title"] || ""; \

35 readonly property string title: cardData && cardData["title"] || ""; \

35 property bool asynchronous: true; \

36 property bool asynchronous: true; \

@@ -41,12 +42,11 @@ function createCardComponent(parent, template, components) {

41 var artAndSummary = hasArt && hasSummary;

42 var artAndSummary = hasArt && hasSummary;

42 var isHorizontal = template["card-layout"] === "horizontal";

43 var isHorizontal = template["card-layout"] === "horizontal";

43 var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);

44 var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);

44− var inOverlay = hasArt && template && template["overlay"] === true;

45 var hasTitle = components["title"] || false;

46 var hasMascot = components["mascot"] || false;

47+ var inOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);

47 var hasSubtitle = components["subtitle"] || false;

48 var hasSubtitle = components["subtitle"] || false;

48 var hasHeaderRow = hasMascot && hasTitle;

49 var hasHeaderRow = hasMascot && hasTitle;

49− var mascotImageHeight = 'units.gu(5.625)';

51 if (hasBackground) {

52 code += 'Loader {\

@@ -88,12 +88,12 @@ function createCardComponent(parent, template, components) {

88 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);'

89 var imageWidthHeight;

90 if (isHorizontal) {

91− if (hasMascot) {

91+ if (hasMascot || hasTitle) {

92 imageWidthHeight = 'width: height * artShape.aspect; \

93− height: mascotImage.height + 2 * units.gu(1);'

93+ height: headerHeight;'

94 } else {

95 imageWidthHeight = 'width: height * artShape.aspect; \

96− height: ' + mascotImageHeight + ' + 2 * units.gu(1);'

96+ height: units.gu(8.625)';

97 }

98 } else {

99 imageWidthHeight = 'width: root.width; \

@@ -144,12 +144,7 @@ function createCardComponent(parent, template, components) {

144 }

145

146 if (inOverlay) {

147− var height;

147+ var height = 'fixedHeaderHeight != -1 ? fixedHeaderHeight : headerHeight;';

148− if (hasMascot) {

149− var height = 'mascotImage.height + 2 * units.gu(1);';

150− } else {

151− var height = mascotImageHeight + ' + 2 * units.gu(1);';

152− }

153 code += 'Loader { \

148 code += 'Loader { \

154 id: overlayLoader; \

149 id: overlayLoader; \

155 anchors { \

150 anchors { \

@@ -219,6 +214,7 @@ function createCardComponent(parent, template, components) {

219 }

214 }

220

215

221 if (hasHeaderRow) {

216 if (hasHeaderRow) {

217+ code += 'readonly property int headerHeight: row.height + row.margins * 2;'

222 code += 'Row { \

218 code += 'Row { \

223 id: row; \

219 id: row; \

224 objectName: "outerRow"; \

220 objectName: "outerRow"; \

@@ -237,6 +233,7 @@ function createCardComponent(parent, template, components) {

237 anchors += headerLeftAnchor;

233 anchors += headerLeftAnchor;

238 anchors += 'anchors.leftMargin: units.gu(1);'

234 anchors += 'anchors.leftMargin: units.gu(1);'

239 anchors += headerVerticalAnchors;

235 anchors += headerVerticalAnchors;

236+ code += 'readonly property int headerHeight: mascotImage.height + units.gu(1) * 2;'

240 } else {

237 } else {

241 anchors = "anchors.verticalCenter: parent.verticalCenter;"

238 anchors = "anchors.verticalCenter: parent.verticalCenter;"

242 }

239 }

@@ -262,7 +259,7 @@ function createCardComponent(parent, template, components) {

262 readonly property int maxSize: Math.max(width, height) * 4; \

259 readonly property int maxSize: Math.max(width, height) * 4; \

263 source: cardData && cardData["mascot"]; \

260 source: cardData && cardData["mascot"]; \

264 width: units.gu(6); \

261 width: units.gu(6); \

265− height: ' + mascotImageHeight + '; \

262+ height: units.gu(5.625); \

266 sourceSize { width: maxSize; height: maxSize } \

263 sourceSize { width: maxSize; height: maxSize } \

267 fillMode: Image.PreserveAspectCrop; \

264 fillMode: Image.PreserveAspectCrop; \

268 horizontalAlignment: Image.AlignHCenter; \

265 horizontalAlignment: Image.AlignHCenter; \

@@ -296,16 +293,17 @@ function createCardComponent(parent, template, components) {

296 width: parent.width - x;';

293 width: parent.width - x;';

297 } else if (hasMascot) {

294 } else if (hasMascot) {

298 titleAnchors = 'anchors.verticalCenter: parent.verticalCenter;'

295 titleAnchors = 'anchors.verticalCenter: parent.verticalCenter;'

299− } else if (inOverlay && hasSubtitle) {

296+ } else if (inOverlay) {

297+ titleAnchors = 'anchors.left: parent.left; \

300− titleAnchors = 'anchors.leftMargin: units.gu(1); \

298+ anchors.leftMargin: units.gu(1); \

301 anchors.right: parent.right; \

299 anchors.right: parent.right; \

302− anchors.bottom: subtitleLabel.top; \

300+ anchors.top: overlayLoader.top; \

303− anchors.bottomMargin: units.dp(2);';

301+ anchors.topMargin: units.gu(1);';

304− titleAnchors += headerLeftAnchor;

305 subtitleAnchors = 'anchors.left: titleLabel.left; \

302 subtitleAnchors = 'anchors.left: titleLabel.left; \

306 anchors.leftMargin: titleLabel.leftMargin; \

303 anchors.leftMargin: titleLabel.leftMargin; \

307− anchors.right: titleLabel.right;';

304+ anchors.right: titleLabel.right; \

308− subtitleAnchors += headerVerticalAnchors;

305+ anchors.top: titleLabel.bottom; \

306+ anchors.topMargin: units.dp(2);';

309 } else {

307 } else {

310 titleAnchors = "anchors.right: parent.right;";

308 titleAnchors = "anchors.right: parent.right;";

311 if (hasMascot) {

309 if (hasMascot) {

@@ -321,6 +319,13 @@ function createCardComponent(parent, template, components) {

321 anchors.top: titleLabel.bottom; \

319 anchors.top: titleLabel.bottom; \

322 anchors.topMargin: units.dp(2);';

320 anchors.topMargin: units.dp(2);';

323 }

321 }

322+ if (!hasHeaderRow) {

323+ if (hasSubtitle) {

324+ code += 'readonly property int headerHeight: subtitleLabel.y + subtitleLabel.height - titleLabel.y + titleLabel.anchors.topMargin * 2 + subtitleLabel.anchors.topMargin;'

325+ } else {

326+ code += 'readonly property int headerHeight: titleLabel.height + titleLabel.anchors.topMargin * 2;'

327+ }

328+ }

324

329

325 code += 'Label { \

330 code += 'Label { \

326 id: titleLabel; \

331 id: titleLabel; \

@@ -332,7 +337,7 @@ function createCardComponent(parent, template, components) {

332 maximumLineCount: 2; \

337 maximumLineCount: 2; \

333 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \

338 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \

334 color: ' + color + '; \

339 color: ' + color + '; \

335− visible: showHeader; \

340+ visible: showHeader ' + (inOverlay ? '&& overlayLoader.active': '') + '; \

336 text: root.title; \

341 text: root.title; \

337 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; \

342 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; \

338 horizontalAlignment: root.headerAlignment; \

343 horizontalAlignment: root.headerAlignment; \

@@ -347,7 +352,7 @@ function createCardComponent(parent, template, components) {

347 fontSize: "small"; \

352 fontSize: "small"; \

348 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \

353 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \

349 color: ' + color + '; \

354 color: ' + color + '; \

350− visible: showHeader && titleLabel.text; \

355+ visible: titleLabel.visible && titleLabel.text; \

351 text: cardData && cardData["subtitle"] || ""; \

356 text: cardData && cardData["subtitle"] || ""; \

352 font.weight: Font.Light; \

357 font.weight: Font.Light; \

353 horizontalAlignment: root.headerAlignment; \

358 horizontalAlignment: root.headerAlignment; \

qml/Dash/CardCarousel.qml+1−1

@@ -60,7 +60,7 @@ DashRenderer {

60 anchors.horizontalCenter: parent.horizontalCenter

61 onLoaded: {

62 item.objectName = "carouselDelegate" + index;

63−// item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });

63+ item.fixedHeaderHeight = Qt.binding(function() { return carousel.headerHeight; });

64 item.height = Qt.binding(function() { return cardTool.cardHeight; });

65 item.cardData = Qt.binding(function() { return model; });

66 item.template = Qt.binding(function() { return cardTool.template; });

qml/Dash/CardTool.qml+1

@@ -125,6 +125,7 @@ Item {

125 /*!

126 type:real \brief Height of the card's header.

127 */

128+ readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0

128 readonly property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0

129 readonly property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0

129

130

130 /*!

131 /*!

tests/mocks/Unity/fake_categories.cpp+1

@@ -169,6 +169,7 @@ Categories::data(const QModelIndex& index, int role) const

169 artMap["field"] = "art";

170 map["art"] = artMap;

171 map["title"] = "HOLA";

172+ map["subtitle"] = "HOLA";

172 return map;

173 return map;

173 }

174 }

174 case RoleProgressSource:

175 case RoleProgressSource:

tests/mocks/Unity/fake_resultsmodel.cpp+2−1

@@ -99,10 +99,11 @@ ResultsModel::data(const QModelIndex& index, int role) const

99 case RoleResult:

100 return QString();

101 case RoleTitle:

102− return QString("Title.%1.%2").arg(m_categoryId).arg(index.row());

102+ return QString("Title.%1.%2 a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a").arg(m_categoryId).arg(index.row());

103 case RoleArt:

104 return qmlDirectory() + "graphics/applicationIcons/dash.png";

105 case RoleSubtitle:

106+ return QString("Subtitle.%1.%2 a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a").arg(m_categoryId).arg(index.row());

106 case RoleMascot:

107 case RoleMascot:

107 case RoleEmblem:

108 case RoleEmblem:

108 case RoleOldPrice:

109 case RoleOldPrice:

tests/qmltests/Dash/tst_Card.qml+1−1

@@ -116,8 +116,8 @@ Rectangle {

116 item.cardData = Qt.binding(function() { return Helpers.mapData(dataArea.text, cardTool.components, dataError); });

117 item.width = Qt.binding(function() { return cardTool.cardWidth || item.implicitWidth; });

118 item.height = Qt.binding(function() { return cardTool.cardHeight || item.implicitHeight; });

119+ item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });

119 }

120 }

120−

121 }

122

123 Rectangle {