No need for the touchdown in the card for the cardtool
We only use that card to get some size measurements so the touchdown code adds nothing
Approved by: Andrea Cimitan
commit19275c7cf679159422cbcafd63913d1310b1fea7
authorAlbert Astals Cid <albert.astals@canonical.com>
dateTue 13 Sep 2016, 06:47 (10 years ago)
parentd2acd8f13fbe5e
plugins/Dash/CardCreator.js+1−1
@@ -925,7 +925,7 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
925925 code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
926926 }
927927
928− if (artShapeStyle != "shadow" && artShapeStyle != "icon") {
928+ if (artShapeStyle != "shadow" && artShapeStyle != "icon" && !isCardTool) {
929929 var touchdownAnchors;
930930 if (hasBackground) {
931931 touchdownAnchors = 'fill: backgroundLoader';
tests/plugins/Dash/cardcreator/1.res.cardcreator−10
@@ -65,15 +65,5 @@ Label {
6565 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
6666 horizontalAlignment: Text.AlignHCenter;
6767 }
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−}
7868implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
7969}
tests/plugins/Dash/cardcreator/11.res.cardcreator−10
@@ -156,15 +156,5 @@ top: titleLabel.bottom;
156156
157157 ]
158158 }
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−}
169159implicitHeight: row.y + row.height + units.gu(1);
170160}
tests/plugins/Dash/cardcreator/12.res.cardcreator−10
@@ -91,15 +91,5 @@ CardSocialActions {
9191 model: cardData && cardData["socialActions"];
9292 onClicked: root.action(actionId);
9393}
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−}
10494implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
10595}
tests/plugins/Dash/cardcreator/4.res.cardcreator−10
@@ -95,15 +95,5 @@ Label {
9595}
9696]
9797}
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−}
10898implicitHeight: row.y + row.height + units.gu(1);
10999}
tests/plugins/Dash/cardcreator/6.res.cardcreator−10
@@ -112,15 +112,5 @@ Item {
112112
113113 ]
114114 }
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−}
125115implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
126116}
tests/plugins/Dash/cardcreator/8.res.cardcreator−10
@@ -93,15 +93,5 @@ left: parent.left;
9393
9494 ]
9595 }
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−}
10696implicitHeight: row.y + row.height + units.gu(1);
10797}
tests/plugins/Dash/cardcreator/9.res.cardcreator+1−11
@@ -105,15 +105,5 @@ CardAudioProgress {
105105 onPressAndHold: {
106106 root.pressAndHold();
107107 }
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;
119109}