git.iko.soy/unity8
on xenial help sign in
No need for the touchdown in the card for the cardtool
51b87cbAlbert Astals Cid
plugins/Dash/CardCreator.js+1−1
compare with xenial
unifiedsplit
@@ -925,7 +925,7 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
925 code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
925 code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
926 }
926 }
927
927
928− if (artShapeStyle != "shadow" && artShapeStyle != "icon") {
928+ if (artShapeStyle != "shadow" && artShapeStyle != "icon" && !isCardTool) {
929 var touchdownAnchors;
929 var touchdownAnchors;
930 if (hasBackground) {
930 if (hasBackground) {
931 touchdownAnchors = 'fill: backgroundLoader';
931 touchdownAnchors = 'fill: backgroundLoader';
tests/plugins/Dash/cardcreator/1.res.cardcreator−10
@@ -65,15 +65,5 @@ Label {
65 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
65 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
66 horizontalAlignment: Text.AlignHCenter;
66 horizontalAlignment: Text.AlignHCenter;
67 }
67 }
68−Loader {
69− active: root.pressed;
70− anchors { fill: artShapeLoader }
71− sourceComponent: UbuntuShape {
72− objectName: "touchdown";
73− anchors.fill: parent;
74− radius: "medium";
75− borderSource: "radius_pressed.sci"
76− }
77−}
78implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
68implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
79}
69}
tests/plugins/Dash/cardcreator/11.res.cardcreator−10
@@ -156,15 +156,5 @@ top: titleLabel.bottom;
156
156
157 ]
157 ]
158 }
158 }
159−Loader {
160− active: root.pressed;
161− anchors { fill: backgroundLoader }
162− sourceComponent: UbuntuShape {
163− objectName: "touchdown";
164− anchors.fill: parent;
165− radius: "medium";
166− borderSource: "radius_pressed.sci"
167− }
168−}
169implicitHeight: row.y + row.height + units.gu(1);
159implicitHeight: row.y + row.height + units.gu(1);
170}
160}
tests/plugins/Dash/cardcreator/12.res.cardcreator−10
@@ -91,15 +91,5 @@ CardSocialActions {
91 model: cardData && cardData["socialActions"];
91 model: cardData && cardData["socialActions"];
92 onClicked: root.action(actionId);
92 onClicked: root.action(actionId);
93}
93}
94−Loader {
95− active: root.pressed;
96− anchors { fill: artShapeLoader }
97− sourceComponent: UbuntuShape {
98− objectName: "touchdown";
99− anchors.fill: parent;
100− radius: "medium";
101− borderSource: "radius_pressed.sci"
102− }
103−}
104implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
94implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
105}
95}
tests/plugins/Dash/cardcreator/4.res.cardcreator−10
@@ -95,15 +95,5 @@ Label {
95}
95}
96]
96]
97}
97}
98−Loader {
99− active: root.pressed;
100− anchors { fill: root }
101− sourceComponent: UbuntuShape {
102− objectName: "touchdown";
103− anchors.fill: parent;
104− radius: "medium";
105− borderSource: "radius_pressed.sci"
106− }
107−}
108implicitHeight: row.y + row.height + units.gu(1);
98implicitHeight: row.y + row.height + units.gu(1);
109}
99}
tests/plugins/Dash/cardcreator/6.res.cardcreator−10
@@ -112,15 +112,5 @@ Item {
112
112
113 ]
113 ]
114 }
114 }
115−Loader {
116− active: root.pressed;
117− anchors { fill: backgroundLoader }
118− sourceComponent: UbuntuShape {
119− objectName: "touchdown";
120− anchors.fill: parent;
121− radius: "medium";
122− borderSource: "radius_pressed.sci"
123− }
124−}
125implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
115implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
126}
116}
tests/plugins/Dash/cardcreator/8.res.cardcreator−10
@@ -93,15 +93,5 @@ left: parent.left;
93
93
94 ]
94 ]
95 }
95 }
96−Loader {
97− active: root.pressed;
98− anchors { fill: backgroundLoader }
99− sourceComponent: UbuntuShape {
100− objectName: "touchdown";
101− anchors.fill: parent;
102− radius: "medium";
103− borderSource: "radius_pressed.sci"
104− }
105−}
106implicitHeight: row.y + row.height + units.gu(1);
96implicitHeight: row.y + row.height + units.gu(1);
107}
97}
tests/plugins/Dash/cardcreator/9.res.cardcreator+1−11
@@ -105,15 +105,5 @@ CardAudioProgress {
105 onPressAndHold: {
105 onPressAndHold: {
106 root.pressAndHold();
106 root.pressAndHold();
107 }
107 }
108− }Loader {
109− active: root.pressed;
110− anchors { fill: root }
111− sourceComponent: UbuntuShape {
112− objectName: "touchdown";
113− anchors.fill: parent;
114− radius: "medium";
115− borderSource: "radius_pressed.sci"
116− }
117−}
118−implicitHeight: audioButton.height;
108+ }implicitHeight: audioButton.height;
119}
109}