Don't modify touchdown visible
commitb5edd7d7eecdfd06eb2b00330926d9b6e6cbc007
authorYing-Chun Liu <paul.liu@canonical.com>
dateTue 21 Oct 2014, 04:51 (12 years ago)
parent149a553
plugins/Dash/CardCreator.js+1−6
@@ -243,12 +243,7 @@ var kTouchdownCode = 'UbuntuShape { \n\
243243 id: touchdown; \n\
244244 objectName: "touchdown"; \n\
245245 anchors { %1 } \n\
246− visible: { \n\
247− if (root.template && root.template["non-interactive"]) { \n\
248− return false; \n\
249− } \n\
250− return root.pressed; \n\
251− } \n\
246+ visible: root.pressed; \n\
252247 radius: "medium"; \n\
253248 borderSource: "radius_pressed.sci" \n\
254249 }\n';
tests/plugins/Dash/cardcreator/1.res+1−6
@@ -83,12 +83,7 @@ UbuntuShape {
8383 id: touchdown;
8484 objectName: "touchdown";
8585 anchors { fill: artShapeHolder }
86− visible: {
87− if (root.template && root.template["non-interactive"]) {
88− return false;
89− }
90− return root.pressed;
91− }
86+ visible: root.pressed;
9287 radius: "medium";
9388 borderSource: "radius_pressed.sci"
9489}
tests/plugins/Dash/cardcreator/2.res+1−6
@@ -127,12 +127,7 @@ UbuntuShape {
127127 id: touchdown;
128128 objectName: "touchdown";
129129 anchors { fill: backgroundLoader }
130− visible: {
131− if (root.template && root.template["non-interactive"]) {
132− return false;
133− }
134− return root.pressed;
135− }
130+ visible: root.pressed;
136131 radius: "medium";
137132 borderSource: "radius_pressed.sci"
138133}
tests/plugins/Dash/cardcreator/3.res+1−6
@@ -100,12 +100,7 @@ UbuntuShape {
100100 id: touchdown;
101101 objectName: "touchdown";
102102 anchors { fill: artShapeHolder }
103− visible: {
104− if (root.template && root.template["non-interactive"]) {
105− return false;
106− }
107− return root.pressed;
108− }
103+ visible: root.pressed;
109104 radius: "medium";
110105 borderSource: "radius_pressed.sci"
111106}
tests/plugins/Dash/cardcreator/4.res+1−6
@@ -105,12 +105,7 @@ UbuntuShape {
105105 id: touchdown;
106106 objectName: "touchdown";
107107 anchors { fill: root }
108− visible: {
109− if (root.template && root.template["non-interactive"]) {
110− return false;
111− }
112− return root.pressed;
113− }
108+ visible: root.pressed;
114109 radius: "medium";
115110 borderSource: "radius_pressed.sci"
116111}
tests/plugins/Dash/cardcreator/5.res+1−6
@@ -145,12 +145,7 @@ UbuntuShape {
145145 id: touchdown;
146146 objectName: "touchdown";
147147 anchors { fill: artShapeHolder }
148− visible: {
149− if (root.template && root.template["non-interactive"]) {
150− return false;
151− }
152− return root.pressed;
153− }
148+ visible: root.pressed;
154149 radius: "medium";
155150 borderSource: "radius_pressed.sci"
156151}
tests/plugins/Dash/cardcreator/6.res+1−6
@@ -114,12 +114,7 @@ UbuntuShape {
114114 id: touchdown;
115115 objectName: "touchdown";
116116 anchors { fill: backgroundLoader }
117− visible: {
118− if (root.template && root.template["non-interactive"]) {
119− return false;
120− }
121− return root.pressed;
122− }
117+ visible: root.pressed;
123118 radius: "medium";
124119 borderSource: "radius_pressed.sci"
125120}
tests/plugins/Dash/cardcreator/7.res+1−6
@@ -140,12 +140,7 @@ UbuntuShape {
140140 id: touchdown;
141141 objectName: "touchdown";
142142 anchors { fill: backgroundLoader }
143− visible: {
144− if (root.template && root.template["non-interactive"]) {
145− return false;
146− }
147− return root.pressed;
148− }
143+ visible: root.pressed;
149144 radius: "medium";
150145 borderSource: "radius_pressed.sci"
151146}