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
commit180d24c65deb0b210bbfd5e8dbfe4d9cdb6f9ce8
authorAlbert Astals Cid <albert.astals@canonical.com>
dateThu 21 Jul 2016, 12:07 (10 years ago)
parent9552e73
plugins/Dash/CardCreator.js+1−1
@@ -933,7 +933,7 @@ function cardString(template, components, isCardTool, artShapeStyle) {
933933 code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
934934 }
935935
936− if (artShapeStyle != "shadow" && artShapeStyle != "icon") {
936+ if (artShapeStyle != "shadow" && artShapeStyle != "icon" && !isCardTool) {
937937 var touchdownAnchors;
938938 if (hasBackground) {
939939 touchdownAnchors = 'fill: backgroundLoader';
tests/plugins/Dash/cardcreator/1.res.cardcreator−10
@@ -70,15 +70,5 @@ Label {
7070 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
7171 horizontalAlignment: Text.AlignHCenter;
7272 }
73−Loader {
74− active: root.pressed;
75− anchors { fill: artShapeHolder }
76− sourceComponent: UbuntuShape {
77− objectName: "touchdown";
78− anchors.fill: parent;
79− radius: "medium";
80− borderSource: "radius_pressed.sci"
81− }
82−}
8373implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
8474}
tests/plugins/Dash/cardcreator/11.res.cardcreator−10
@@ -161,15 +161,5 @@ top: titleLabel.bottom;
161161
162162 ]
163163 }
164−Loader {
165− active: root.pressed;
166− anchors { fill: backgroundLoader }
167− sourceComponent: UbuntuShape {
168− objectName: "touchdown";
169− anchors.fill: parent;
170− radius: "medium";
171− borderSource: "radius_pressed.sci"
172− }
173−}
174164implicitHeight: row.y + row.height + units.gu(1);
175165}
tests/plugins/Dash/cardcreator/12.res.cardcreator−10
@@ -96,15 +96,5 @@ CardSocialActions {
9696 model: cardData && cardData["socialActions"];
9797 onClicked: root.action(actionId);
9898}
99−Loader {
100− active: root.pressed;
101− anchors { fill: artShapeHolder }
102− sourceComponent: UbuntuShape {
103− objectName: "touchdown";
104− anchors.fill: parent;
105− radius: "medium";
106− borderSource: "radius_pressed.sci"
107− }
108−}
10999implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
110100}
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}