git.iko.soy/unity8
on xenial help sign in
Improve overlay and horizontal stuff
b3b7847Albert Astals
plugins/Dash/CardCreator.js+19−11
compare with xenial
unifiedsplit
@@ -285,15 +285,6 @@ function createCardComponent(parent, template, components) {
285 color = '"grey"';
285 color = '"grey"';
286 }
286 }
287
287
288− var anchors = "anchors.right: parent.right;";
289− if (hasMascot) {
290− anchors += 'anchors.left: mascotImage.right; \
291− anchors.leftMargin: units.gu(1);';
292− } else {
293− anchors += headerLeftAnchor;
294− }
295− anchors += headerVerticalAnchors;
296−
297 var titleAnchors = "";
288 var titleAnchors = "";
298 var subtitleAnchors = "";
289 var subtitleAnchors = "";
299 if (hasMascot && hasSubtitle) {
290 if (hasMascot && hasSubtitle) {
@@ -305,8 +296,24 @@ function createCardComponent(parent, template, components) {
305 width: parent.width - x;';
296 width: parent.width - x;';
306 } else if (hasMascot) {
297 } else if (hasMascot) {
307 titleAnchors = 'anchors.verticalCenter: parent.verticalCenter;'
298 titleAnchors = 'anchors.verticalCenter: parent.verticalCenter;'
299+ } else if (inOverlay && hasSubtitle) {
300+ titleAnchors = 'anchors.right: parent.right; \
301+ anchors.bottom: subtitleLabel.top; \
302+ anchors.bottomMargin: units.dp(2);';
303+ titleAnchors += headerLeftAnchor;
304+ subtitleAnchors = 'anchors.left: titleLabel.left; \
305+ anchors.leftMargin: titleLabel.leftMargin; \
306+ anchors.right: titleLabel.right;';
307+ subtitleAnchors += headerVerticalAnchors;
308 } else {
308 } else {
309− titleAnchors = anchors;
309+ titleAnchors = "anchors.right: parent.right;";
310+ if (hasMascot) {
311+ titleAnchors += 'anchors.left: mascotImage.right; \
312+ anchors.leftMargin: units.gu(1);';
313+ } else {
314+ titleAnchors += headerLeftAnchor;
315+ }
316+ titleAnchors += headerVerticalAnchors;
310 subtitleAnchors = 'anchors.left: titleLabel.left; \
317 subtitleAnchors = 'anchors.left: titleLabel.left; \
311 anchors.leftMargin: titleLabel.leftMargin; \
318 anchors.leftMargin: titleLabel.leftMargin; \
312 anchors.right: titleLabel.right; \
319 anchors.right: titleLabel.right; \
@@ -357,7 +364,8 @@ function createCardComponent(parent, template, components) {
357
364
358 if (hasSummary) {
365 if (hasSummary) {
359 var summaryTopAnchor;
366 var summaryTopAnchor;
367+ if (isHorizontal && hasArt) summaryTopAnchor = "artShapeHolder.bottom";
360− if (isHorizontal) summaryTopAnchor = "artShapeHolder.bottom";
368+ else if (inOverlay && hasArt) summaryTopAnchor = "artShapeHolder.bottom";
361 else if (hasHeaderRow) summaryTopAnchor = "row.bottom";
369 else if (hasHeaderRow) summaryTopAnchor = "row.bottom";
362 else if (hasMascot) summaryTopAnchor = "mascotImage.bottom";
370 else if (hasMascot) summaryTopAnchor = "mascotImage.bottom";
363 else if (hasSubtitle) summaryTopAnchor = "subtitleLabel.bottom";
371 else if (hasSubtitle) summaryTopAnchor = "subtitleLabel.bottom";