git.iko.soy/unity8
on xenial help sign in
Add code for subtitle is not appeared
07ce507Ying-Chun Liu
plugins/Dash/CardCreator.js+16−6
compare with xenial
unifiedsplit
@@ -402,7 +402,13 @@ function cardString(template, components) {
402 } else if (hasMascot) {
402 } else if (hasMascot) {
403 code += 'readonly property int headerHeight: mascotImage.height;\n'
403 code += 'readonly property int headerHeight: mascotImage.height;\n'
404 } else if (hasAttributes) {
404 } else if (hasAttributes) {
405+ if (hasSubtitle) {
405− code += 'readonly property int headerHeight: titleLabel.height + titleLabel.anchors.topMargin + subtitleLabel.height + subtitleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'
406+ code += 'readonly property int headerHeight: titleLabel.height + titleLabel.anchors.topMargin + subtitleLabel.height + subtitleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'
407+ } else if (hasTitle) {
408+ code += 'readonly property int headerHeight: titleLabel.height + titleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'
409+ } else {
410+ code += 'readonly property int headerHeight: attributesRow.height + attributesRow.anchors.topMargin;\n'
411+ }
406 } else if (hasSubtitle) {
412 } else if (hasSubtitle) {
407 code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'
413 code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'
408 } else if (hasTitle) {
414 } else if (hasTitle) {
@@ -482,11 +488,15 @@ function cardString(template, components) {
482 right: titleLabel.right; \n\
488 right: titleLabel.right; \n\
483 top: titleLabel.bottom; \n\
489 top: titleLabel.bottom; \n\
484 topMargin: units.dp(2);\n';
490 topMargin: units.dp(2);\n';
491+ if (hasSubtitle) {
485− attributesAnchors = 'left: subtitleLabel.left; \n\
492+ attributesAnchors = 'left: subtitleLabel.left; \n\
486− leftMargin: subtitleLabel.leftMargin; \n\
493+ leftMargin: subtitleLabel.leftMargin; \n\
487− right: subtitleLabel.right; \n\
494+ right: subtitleLabel.right; \n\
488− top: subtitleLabel.bottom; \n\
495+ top: subtitleLabel.bottom; \n\
489− topMargin: units.dp(2);\n';
496+ topMargin: units.dp(2);\n';
497+ } else {
498+ attributesAnchors = subtitleAnchors;
499+ }
490 }
500 }
491
501
492 var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
502 var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');