on xenial help sign in
Don't modify touchdown visible
b5edd7dYing-Chun Liu
plugins/Dash/CardCreator.js+1−6
@@ -243,12 +243,7 @@ var kTouchdownCode = 'UbuntuShape { \n\
243 id: touchdown; \n\
243 id: touchdown; \n\
244 objectName: "touchdown"; \n\
244 objectName: "touchdown"; \n\
245 anchors { %1 } \n\
245 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\
246+ visible: root.pressed; \n\
251− } \n\
252 radius: "medium"; \n\
247 radius: "medium"; \n\
253 borderSource: "radius_pressed.sci" \n\
248 borderSource: "radius_pressed.sci" \n\
254 }\n';
249 }\n';
tests/plugins/Dash/cardcreator/1.res+1−6
@@ -83,12 +83,7 @@ UbuntuShape {
83 id: touchdown;
83 id: touchdown;
84 objectName: "touchdown";
84 objectName: "touchdown";
85 anchors { fill: artShapeHolder }
85 anchors { fill: artShapeHolder }
86− visible: {
87− if (root.template && root.template["non-interactive"]) {
88− return false;
89− }
90− return root.pressed;
86+ visible: root.pressed;
91− }
92 radius: "medium";
87 radius: "medium";
93 borderSource: "radius_pressed.sci"
88 borderSource: "radius_pressed.sci"
94}
89}
tests/plugins/Dash/cardcreator/2.res+1−6
@@ -127,12 +127,7 @@ UbuntuShape {
127 id: touchdown;
127 id: touchdown;
128 objectName: "touchdown";
128 objectName: "touchdown";
129 anchors { fill: backgroundLoader }
129 anchors { fill: backgroundLoader }
130− visible: {
131− if (root.template && root.template["non-interactive"]) {
132− return false;
133− }
134− return root.pressed;
130+ visible: root.pressed;
135− }
136 radius: "medium";
131 radius: "medium";
137 borderSource: "radius_pressed.sci"
132 borderSource: "radius_pressed.sci"
138}
133}
tests/plugins/Dash/cardcreator/3.res+1−6
@@ -100,12 +100,7 @@ UbuntuShape {
100 id: touchdown;
100 id: touchdown;
101 objectName: "touchdown";
101 objectName: "touchdown";
102 anchors { fill: artShapeHolder }
102 anchors { fill: artShapeHolder }
103− visible: {
104− if (root.template && root.template["non-interactive"]) {
105− return false;
106− }
107− return root.pressed;
103+ visible: root.pressed;
108− }
109 radius: "medium";
104 radius: "medium";
110 borderSource: "radius_pressed.sci"
105 borderSource: "radius_pressed.sci"
111}
106}
tests/plugins/Dash/cardcreator/4.res+1−6
@@ -105,12 +105,7 @@ UbuntuShape {
105 id: touchdown;
105 id: touchdown;
106 objectName: "touchdown";
106 objectName: "touchdown";
107 anchors { fill: root }
107 anchors { fill: root }
108− visible: {
109− if (root.template && root.template["non-interactive"]) {
110− return false;
111− }
112− return root.pressed;
108+ visible: root.pressed;
113− }
114 radius: "medium";
109 radius: "medium";
115 borderSource: "radius_pressed.sci"
110 borderSource: "radius_pressed.sci"
116}
111}
tests/plugins/Dash/cardcreator/5.res+1−6
@@ -145,12 +145,7 @@ UbuntuShape {
145 id: touchdown;
145 id: touchdown;
146 objectName: "touchdown";
146 objectName: "touchdown";
147 anchors { fill: artShapeHolder }
147 anchors { fill: artShapeHolder }
148− visible: {
149− if (root.template && root.template["non-interactive"]) {
150− return false;
151− }
152− return root.pressed;
148+ visible: root.pressed;
153− }
154 radius: "medium";
149 radius: "medium";
155 borderSource: "radius_pressed.sci"
150 borderSource: "radius_pressed.sci"
156}
151}
tests/plugins/Dash/cardcreator/6.res+1−6
@@ -114,12 +114,7 @@ UbuntuShape {
114 id: touchdown;
114 id: touchdown;
115 objectName: "touchdown";
115 objectName: "touchdown";
116 anchors { fill: backgroundLoader }
116 anchors { fill: backgroundLoader }
117− visible: {
118− if (root.template && root.template["non-interactive"]) {
119− return false;
120− }
121− return root.pressed;
117+ visible: root.pressed;
122− }
123 radius: "medium";
118 radius: "medium";
124 borderSource: "radius_pressed.sci"
119 borderSource: "radius_pressed.sci"
125}
120}
tests/plugins/Dash/cardcreator/7.res+1−6
@@ -140,12 +140,7 @@ UbuntuShape {
140 id: touchdown;
140 id: touchdown;
141 objectName: "touchdown";
141 objectName: "touchdown";
142 anchors { fill: backgroundLoader }
142 anchors { fill: backgroundLoader }
143− visible: {
144− if (root.template && root.template["non-interactive"]) {
145− return false;
146− }
147− return root.pressed;
143+ visible: root.pressed;
148− }
149 radius: "medium";
144 radius: "medium";
150 borderSource: "radius_pressed.sci"
145 borderSource: "radius_pressed.sci"
151}
146}