on xenial help sign in
Add maximumLineCount for subtitle label in cards Fixes: #1414870

Approved by: Albert Astals Cid

commit286d082e74d0db70f708cba6a2f999434f0ef80f authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 24 Feb 2015, 10:16 (12 years ago) parentd89bf73f2c836c
7 files changed+7
plugins/Dash/CardCreator.js+1 tests/plugins/Dash/cardcreator/2.res+1 tests/plugins/Dash/cardcreator/3.res+1 tests/plugins/Dash/cardcreator/4.res+1 tests/plugins/Dash/cardcreator/5.res+1 tests/plugins/Dash/cardcreator/6.res+1 tests/plugins/Dash/cardcreator/7.res+1
plugins/Dash/CardCreator.js+1
@@ -258,6 +258,7 @@ var kSubtitleLabelCode = 'Label { \n\
258258 anchors { %1 } \n\
259259 anchors.topMargin: units.dp(2); \n\
260260 elide: Text.ElideRight; \n\
261+ maximumLineCount: 1; \n\
261262 fontSize: "x-small"; \n\
262263 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
263264 color: %2; \n\
tests/plugins/Dash/cardcreator/2.res+1
@@ -109,6 +109,7 @@ CroppedImageMinimumSourceSize {
109109 }
110110 anchors.topMargin: units.dp(2);
111111 elide: Text.ElideRight;
112+ maximumLineCount: 1;
112113 fontSize: "x-small";
113114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
114115 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");
tests/plugins/Dash/cardcreator/3.res+1
@@ -89,6 +89,7 @@ Label {
8989 }
9090 anchors.topMargin: units.dp(2);
9191 elide: Text.ElideRight;
92+ maximumLineCount: 1;
9293 fontSize: "x-small";
9394 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
9495 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
tests/plugins/Dash/cardcreator/4.res+1
@@ -89,6 +89,7 @@ Label {
8989 }
9090 anchors.topMargin: units.dp(2);
9191 elide: Text.ElideRight;
92+ maximumLineCount: 1;
9293 fontSize: "x-small";
9394 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
9495 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
tests/plugins/Dash/cardcreator/5.res+1
@@ -134,6 +134,7 @@ Label {
134134 }
135135 anchors.topMargin: units.dp(2);
136136 elide: Text.ElideRight;
137+ maximumLineCount: 1;
137138 fontSize: "x-small";
138139 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
139140 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
tests/plugins/Dash/cardcreator/6.res+1
@@ -88,6 +88,7 @@ Item {
8888 }
8989 anchors.topMargin: units.dp(2);
9090 elide: Text.ElideRight;
91+ maximumLineCount: 1;
9192 fontSize: "x-small";
9293 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
9394 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");
tests/plugins/Dash/cardcreator/7.res+1
@@ -110,6 +110,7 @@ CroppedImageMinimumSourceSize {
110110 }
111111 anchors.topMargin: units.dp(2);
112112 elide: Text.ElideRight;
113+ maximumLineCount: 1;
113114 fontSize: "x-small";
114115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115116 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");