219e3b2 · unity8 · git.iko.soy

plugins/Dash/CardCreator.js+2−2

compare with xenial

unifiedsplit

@@ -217,13 +217,13 @@ var kTitleLabelCode = 'Label { \n\

217 elide: Text.ElideRight; \n\

218 fontSize: "small"; \n\

219 wrapMode: Text.Wrap; \n\

220− maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; \n\

220+ maximumLineCount: 2; \n\

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

222 color: %2; \n\

223 visible: showHeader %3; \n\

224 text: root.title; \n\

225 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\

226− horizontalAlignment: root.titleAlignment; \n\

226+ horizontalAlignment: lineCount === 2 ? Text.AlignLeft : root.titleAlignment; \n\

227 }\n';

228

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

tests/plugins/Dash/cardcreator/1.res+2−2

@@ -69,13 +69,13 @@ Label {

69 elide: Text.ElideRight;

70 fontSize: "small";

71 wrapMode: Text.Wrap;

72− maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2;

72+ maximumLineCount: 2;

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

74 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

75 visible: showHeader ;

76 text: root.title;

77 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

78− horizontalAlignment: root.titleAlignment;

78+ horizontalAlignment: lineCount === 2 ? Text.AlignLeft : root.titleAlignment;

79 }

80UbuntuShape {

81 id: touchdown;

tests/plugins/Dash/cardcreator/2.res+2−2

@@ -93,13 +93,13 @@ Image {

93 elide: Text.ElideRight;

94 fontSize: "small";

95 wrapMode: Text.Wrap;

96− maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2;

96+ maximumLineCount: 2;

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

98 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

99 visible: showHeader ;

100 text: root.title;

101 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

102− horizontalAlignment: root.titleAlignment;

102+ horizontalAlignment: lineCount === 2 ? Text.AlignLeft : root.titleAlignment;

103 }

104 ,Label {

105 id: subtitleLabel;

tests/plugins/Dash/cardcreator/3.res+2−2

@@ -69,13 +69,13 @@ Label {

69 elide: Text.ElideRight;

70 fontSize: "small";

71 wrapMode: Text.Wrap;

72− maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2;

72+ maximumLineCount: 2;

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

74 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

75 visible: showHeader ;

76 text: root.title;

77 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

78− horizontalAlignment: root.titleAlignment;

78+ horizontalAlignment: lineCount === 2 ? Text.AlignLeft : root.titleAlignment;

79 }

80Label {

81 id: subtitleLabel;

tests/plugins/Dash/cardcreator/4.res+2−2

@@ -73,13 +73,13 @@ Label {

73 elide: Text.ElideRight;

74 fontSize: "small";

75 wrapMode: Text.Wrap;

76− maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2;

76+ maximumLineCount: 2;

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

78 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

79 visible: showHeader ;

80 text: root.title;

81 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

82− horizontalAlignment: root.titleAlignment;

82+ horizontalAlignment: lineCount === 2 ? Text.AlignLeft : root.titleAlignment;

83 }

84,Label {

85 id: subtitleLabel;

tests/plugins/Dash/cardcreator/5.res+2−2

@@ -113,13 +113,13 @@ Label {

113 elide: Text.ElideRight;

114 fontSize: "small";

115 wrapMode: Text.Wrap;

116− maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2;

116+ maximumLineCount: 2;

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

118 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

119 visible: showHeader && overlayLoader.active;

120 text: root.title;

121 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

122− horizontalAlignment: root.titleAlignment;

122+ horizontalAlignment: lineCount === 2 ? Text.AlignLeft : root.titleAlignment;

123 }

124Label {

125 id: subtitleLabel;

tests/plugins/Dash/cardcreator/6.res+2−2

@@ -68,13 +68,13 @@ Item {

68 elide: Text.ElideRight;

69 fontSize: "small";

70 wrapMode: Text.Wrap;

71− maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2;

71+ maximumLineCount: 2;

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

73 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

74 visible: showHeader ;

75 text: root.title;

76 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.titleAlignment;

77+ horizontalAlignment: lineCount === 2 ? Text.AlignLeft : root.titleAlignment;

78 }

79,Label {

80 id: subtitleLabel;

tests/plugins/Dash/cardcreator/7.res+2−2

@@ -94,13 +94,13 @@ Image {

94 elide: Text.ElideRight;

95 fontSize: "small";

96 wrapMode: Text.Wrap;

97− maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2;

97+ maximumLineCount: 2;

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

99 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

100 visible: showHeader ;

101 text: root.title;

102 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

103− horizontalAlignment: root.titleAlignment;

103+ horizontalAlignment: lineCount === 2 ? Text.AlignLeft : root.titleAlignment;

104 }

105,Label {

106 id: subtitleLabel;