git.iko.soy/unity8
on xenial help sign in
Small radius on cards
dfe21d6Andrea Cimitan
plugins/Dash/CardCreator.js+5−5
compare with xenial
unifiedsplit
@@ -28,7 +28,7 @@ var kBackgroundLoaderCode = 'Loader {\n\
28 visible: status === Loader.Ready; \n\
28 visible: status === Loader.Ready; \n\
29 sourceComponent: UbuntuShape { \n\
29 sourceComponent: UbuntuShape { \n\
30 objectName: "background"; \n\
30 objectName: "background"; \n\
31− radius: "medium"; \n\
31+ radius: "small"; \n\
32 aspect: { \n\
32 aspect: { \n\
33 switch (root.backgroundShapeStyle) { \n\
33 switch (root.backgroundShapeStyle) { \n\
34 case "inset": return UbuntuShape.Inset; \n\
34 case "inset": return UbuntuShape.Inset; \n\
@@ -64,7 +64,7 @@ var kArtUbuntuShapeCode = 'UbuntuShape { \n\
64 anchors.fill: parent; \n\
64 anchors.fill: parent; \n\
65 source: artImage; \n\
65 source: artImage; \n\
66 sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\
66 sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\
67− radius: "medium"; \n\
67+ radius: "small"; \n\
68 aspect: %1; \n\
68 aspect: %1; \n\
69 }';
69 }';
70
70
@@ -166,7 +166,7 @@ var kAudioButtonCode = 'AbstractButton { \n\
166 UbuntuShape { \n\
166 UbuntuShape { \n\
167 anchors.fill: parent; \n\
167 anchors.fill: parent; \n\
168 visible: parent.pressed; \n\
168 visible: parent.pressed; \n\
169− radius: "medium"; \n\
169+ radius: "small"; \n\
170 } \n\
170 } \n\
171 Rectangle { \n\
171 Rectangle { \n\
172 color: Qt.rgba(0, 0, 0, 0.5); \n\
172 color: Qt.rgba(0, 0, 0, 0.5); \n\
@@ -214,7 +214,7 @@ var kOverlayLoaderCode = 'Loader { \n\
214 id: overlay; \n\
214 id: overlay; \n\
215 property real luminance: Style.luminance(overlayColor); \n\
215 property real luminance: Style.luminance(overlayColor); \n\
216 aspect: UbuntuShape.Flat; \n\
216 aspect: UbuntuShape.Flat; \n\
217− radius: "medium"; \n\
217+ radius: "small"; \n\
218 overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
218 overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
219 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\
219 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\
220 } \n\
220 } \n\
@@ -337,7 +337,7 @@ var kTouchdownCode = 'Loader { \n\
337 sourceComponent: UbuntuShape { \n\
337 sourceComponent: UbuntuShape { \n\
338 objectName: "touchdown"; \n\
338 objectName: "touchdown"; \n\
339 anchors.fill: parent; \n\
339 anchors.fill: parent; \n\
340− radius: "medium"; \n\
340+ radius: "small"; \n\
341 borderSource: "radius_pressed.sci" \n\
341 borderSource: "radius_pressed.sci" \n\
342 } \n\
342 } \n\
343 }\n';
343 }\n';
tests/plugins/Dash/cardcreator/1.res+2−2
@@ -31,7 +31,7 @@ Loader {
31 anchors.fill: parent;
31 anchors.fill: parent;
32 source: artImage;
32 source: artImage;
33 sourceFillMode: UbuntuShape.PreserveAspectCrop;
33 sourceFillMode: UbuntuShape.PreserveAspectCrop;
34− radius: "medium";
34+ radius: "small";
35 aspect: UbuntuShape.Flat;
35 aspect: UbuntuShape.Flat;
36 }
36 }
37 width: root.fixedArtShapeSize.width;
37 width: root.fixedArtShapeSize.width;
@@ -74,7 +74,7 @@ Loader {
74 sourceComponent: UbuntuShape {
74 sourceComponent: UbuntuShape {
75 objectName: "touchdown";
75 objectName: "touchdown";
76 anchors.fill: parent;
76 anchors.fill: parent;
77− radius: "medium";
77+ radius: "small";
78 borderSource: "radius_pressed.sci"
78 borderSource: "radius_pressed.sci"
79 }
79 }
80}
80}
tests/plugins/Dash/cardcreator/1.res.cardcreator+1−1
@@ -28,7 +28,7 @@ Loader {
28 anchors.fill: parent;
28 anchors.fill: parent;
29 source: artImage;
29 source: artImage;
30 sourceFillMode: UbuntuShape.PreserveAspectCrop;
30 sourceFillMode: UbuntuShape.PreserveAspectCrop;
31− radius: "medium";
31+ radius: "small";
32 aspect: UbuntuShape.Flat;
32 aspect: UbuntuShape.Flat;
33 }
33 }
34 width: image.status !== Image.Ready ? 0 : image.width;
34 width: image.status !== Image.Ready ? 0 : image.width;
tests/plugins/Dash/cardcreator/10.res+1−1
@@ -19,7 +19,7 @@ Loader {
19 visible: status === Loader.Ready;
19 visible: status === Loader.Ready;
20 sourceComponent: UbuntuShape {
20 sourceComponent: UbuntuShape {
21 objectName: "background";
21 objectName: "background";
22− radius: "medium";
22+ radius: "small";
23 aspect: {
23 aspect: {
24 switch (root.backgroundShapeStyle) {
24 switch (root.backgroundShapeStyle) {
25 case "inset": return UbuntuShape.Inset;
25 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/10.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
17 visible: status === Loader.Ready;
17 visible: status === Loader.Ready;
18 sourceComponent: UbuntuShape {
18 sourceComponent: UbuntuShape {
19 objectName: "background";
19 objectName: "background";
20− radius: "medium";
20+ radius: "small";
21 aspect: {
21 aspect: {
22 switch (root.backgroundShapeStyle) {
22 switch (root.backgroundShapeStyle) {
23 case "inset": return UbuntuShape.Inset;
23 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/11.res+3−3
@@ -19,7 +19,7 @@ Loader {
19 visible: status === Loader.Ready;
19 visible: status === Loader.Ready;
20 sourceComponent: UbuntuShape {
20 sourceComponent: UbuntuShape {
21 objectName: "background";
21 objectName: "background";
22− radius: "medium";
22+ radius: "small";
23 aspect: {
23 aspect: {
24 switch (root.backgroundShapeStyle) {
24 switch (root.backgroundShapeStyle) {
25 case "inset": return UbuntuShape.Inset;
25 case "inset": return UbuntuShape.Inset;
@@ -69,7 +69,7 @@ Loader {
69 anchors.fill: parent;
69 anchors.fill: parent;
70 source: artImage;
70 source: artImage;
71 sourceFillMode: UbuntuShape.PreserveAspectCrop;
71 sourceFillMode: UbuntuShape.PreserveAspectCrop;
72− radius: "medium";
72+ radius: "small";
73 aspect: UbuntuShape.Flat;
73 aspect: UbuntuShape.Flat;
74 }
74 }
75 width: root.fixedArtShapeSize.width;
75 width: root.fixedArtShapeSize.width;
@@ -168,7 +168,7 @@ Loader {
168 sourceComponent: UbuntuShape {
168 sourceComponent: UbuntuShape {
169 objectName: "touchdown";
169 objectName: "touchdown";
170 anchors.fill: parent;
170 anchors.fill: parent;
171− radius: "medium";
171+ radius: "small";
172 borderSource: "radius_pressed.sci"
172 borderSource: "radius_pressed.sci"
173 }
173 }
174}
174}
tests/plugins/Dash/cardcreator/11.res.cardcreator+2−2
@@ -17,7 +17,7 @@ Loader {
17 visible: status === Loader.Ready;
17 visible: status === Loader.Ready;
18 sourceComponent: UbuntuShape {
18 sourceComponent: UbuntuShape {
19 objectName: "background";
19 objectName: "background";
20− radius: "medium";
20+ radius: "small";
21 aspect: {
21 aspect: {
22 switch (root.backgroundShapeStyle) {
22 switch (root.backgroundShapeStyle) {
23 case "inset": return UbuntuShape.Inset;
23 case "inset": return UbuntuShape.Inset;
@@ -66,7 +66,7 @@ Loader {
66 anchors.fill: parent;
66 anchors.fill: parent;
67 source: artImage;
67 source: artImage;
68 sourceFillMode: UbuntuShape.PreserveAspectCrop;
68 sourceFillMode: UbuntuShape.PreserveAspectCrop;
69− radius: "medium";
69+ radius: "small";
70 aspect: UbuntuShape.Flat;
70 aspect: UbuntuShape.Flat;
71 }
71 }
72 width: image.status !== Image.Ready ? 0 : image.width;
72 width: image.status !== Image.Ready ? 0 : image.width;
tests/plugins/Dash/cardcreator/12.res+2−2
@@ -31,7 +31,7 @@ Loader {
31 anchors.fill: parent;
31 anchors.fill: parent;
32 source: artImage;
32 source: artImage;
33 sourceFillMode: UbuntuShape.PreserveAspectCrop;
33 sourceFillMode: UbuntuShape.PreserveAspectCrop;
34− radius: "medium";
34+ radius: "small";
35 aspect: UbuntuShape.Flat;
35 aspect: UbuntuShape.Flat;
36 }
36 }
37 width: root.fixedArtShapeSize.width;
37 width: root.fixedArtShapeSize.width;
@@ -100,7 +100,7 @@ Loader {
100 sourceComponent: UbuntuShape {
100 sourceComponent: UbuntuShape {
101 objectName: "touchdown";
101 objectName: "touchdown";
102 anchors.fill: parent;
102 anchors.fill: parent;
103− radius: "medium";
103+ radius: "small";
104 borderSource: "radius_pressed.sci"
104 borderSource: "radius_pressed.sci"
105 }
105 }
106}
106}
tests/plugins/Dash/cardcreator/12.res.cardcreator+1−1
@@ -28,7 +28,7 @@ Loader {
28 anchors.fill: parent;
28 anchors.fill: parent;
29 source: artImage;
29 source: artImage;
30 sourceFillMode: UbuntuShape.PreserveAspectCrop;
30 sourceFillMode: UbuntuShape.PreserveAspectCrop;
31− radius: "medium";
31+ radius: "small";
32 aspect: UbuntuShape.Flat;
32 aspect: UbuntuShape.Flat;
33 }
33 }
34 width: image.status !== Image.Ready ? 0 : image.width;
34 width: image.status !== Image.Ready ? 0 : image.width;
tests/plugins/Dash/cardcreator/2.res+1−1
@@ -19,7 +19,7 @@ Loader {
19 visible: status === Loader.Ready;
19 visible: status === Loader.Ready;
20 sourceComponent: UbuntuShape {
20 sourceComponent: UbuntuShape {
21 objectName: "background";
21 objectName: "background";
22− radius: "medium";
22+ radius: "small";
23 aspect: {
23 aspect: {
24 switch (root.backgroundShapeStyle) {
24 switch (root.backgroundShapeStyle) {
25 case "inset": return UbuntuShape.Inset;
25 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/2.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
17 visible: status === Loader.Ready;
17 visible: status === Loader.Ready;
18 sourceComponent: UbuntuShape {
18 sourceComponent: UbuntuShape {
19 objectName: "background";
19 objectName: "background";
20− radius: "medium";
20+ radius: "small";
21 aspect: {
21 aspect: {
22 switch (root.backgroundShapeStyle) {
22 switch (root.backgroundShapeStyle) {
23 case "inset": return UbuntuShape.Inset;
23 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/4.res+1−1
@@ -103,7 +103,7 @@ Loader {
103 sourceComponent: UbuntuShape {
103 sourceComponent: UbuntuShape {
104 objectName: "touchdown";
104 objectName: "touchdown";
105 anchors.fill: parent;
105 anchors.fill: parent;
106− radius: "medium";
106+ radius: "small";
107 borderSource: "radius_pressed.sci"
107 borderSource: "radius_pressed.sci"
108 }
108 }
109}
109}
tests/plugins/Dash/cardcreator/5.res+1−1
@@ -51,7 +51,7 @@ Loader {
51 id: overlay;
51 id: overlay;
52 property real luminance: Style.luminance(overlayColor);
52 property real luminance: Style.luminance(overlayColor);
53 aspect: UbuntuShape.Flat;
53 aspect: UbuntuShape.Flat;
54− radius: "medium";
54+ radius: "small";
55 overlayColor: cardData && cardData["overlayColor"] || "#99000000";
55 overlayColor: cardData && cardData["overlayColor"] || "#99000000";
56 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1);
56 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1);
57 }
57 }
tests/plugins/Dash/cardcreator/5.res.cardcreator+1−1
@@ -48,7 +48,7 @@ Loader {
48 id: overlay;
48 id: overlay;
49 property real luminance: Style.luminance(overlayColor);
49 property real luminance: Style.luminance(overlayColor);
50 aspect: UbuntuShape.Flat;
50 aspect: UbuntuShape.Flat;
51− radius: "medium";
51+ radius: "small";
52 overlayColor: cardData && cardData["overlayColor"] || "#99000000";
52 overlayColor: cardData && cardData["overlayColor"] || "#99000000";
53 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1);
53 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1);
54 }
54 }
tests/plugins/Dash/cardcreator/6.res+2−2
@@ -19,7 +19,7 @@ Loader {
19 visible: status === Loader.Ready;
19 visible: status === Loader.Ready;
20 sourceComponent: UbuntuShape {
20 sourceComponent: UbuntuShape {
21 objectName: "background";
21 objectName: "background";
22− radius: "medium";
22+ radius: "small";
23 aspect: {
23 aspect: {
24 switch (root.backgroundShapeStyle) {
24 switch (root.backgroundShapeStyle) {
25 case "inset": return UbuntuShape.Inset;
25 case "inset": return UbuntuShape.Inset;
@@ -119,7 +119,7 @@ Loader {
119 sourceComponent: UbuntuShape {
119 sourceComponent: UbuntuShape {
120 objectName: "touchdown";
120 objectName: "touchdown";
121 anchors.fill: parent;
121 anchors.fill: parent;
122− radius: "medium";
122+ radius: "small";
123 borderSource: "radius_pressed.sci"
123 borderSource: "radius_pressed.sci"
124 }
124 }
125}
125}
tests/plugins/Dash/cardcreator/6.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
17 visible: status === Loader.Ready;
17 visible: status === Loader.Ready;
18 sourceComponent: UbuntuShape {
18 sourceComponent: UbuntuShape {
19 objectName: "background";
19 objectName: "background";
20− radius: "medium";
20+ radius: "small";
21 aspect: {
21 aspect: {
22 switch (root.backgroundShapeStyle) {
22 switch (root.backgroundShapeStyle) {
23 case "inset": return UbuntuShape.Inset;
23 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/7.res+1−1
@@ -19,7 +19,7 @@ Loader {
19 visible: status === Loader.Ready;
19 visible: status === Loader.Ready;
20 sourceComponent: UbuntuShape {
20 sourceComponent: UbuntuShape {
21 objectName: "background";
21 objectName: "background";
22− radius: "medium";
22+ radius: "small";
23 aspect: {
23 aspect: {
24 switch (root.backgroundShapeStyle) {
24 switch (root.backgroundShapeStyle) {
25 case "inset": return UbuntuShape.Inset;
25 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/7.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
17 visible: status === Loader.Ready;
17 visible: status === Loader.Ready;
18 sourceComponent: UbuntuShape {
18 sourceComponent: UbuntuShape {
19 objectName: "background";
19 objectName: "background";
20− radius: "medium";
20+ radius: "small";
21 aspect: {
21 aspect: {
22 switch (root.backgroundShapeStyle) {
22 switch (root.backgroundShapeStyle) {
23 case "inset": return UbuntuShape.Inset;
23 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/8.res+2−2
@@ -19,7 +19,7 @@ Loader {
19 visible: status === Loader.Ready;
19 visible: status === Loader.Ready;
20 sourceComponent: UbuntuShape {
20 sourceComponent: UbuntuShape {
21 objectName: "background";
21 objectName: "background";
22− radius: "medium";
22+ radius: "small";
23 aspect: {
23 aspect: {
24 switch (root.backgroundShapeStyle) {
24 switch (root.backgroundShapeStyle) {
25 case "inset": return UbuntuShape.Inset;
25 case "inset": return UbuntuShape.Inset;
@@ -101,7 +101,7 @@ Loader {
101 sourceComponent: UbuntuShape {
101 sourceComponent: UbuntuShape {
102 objectName: "touchdown";
102 objectName: "touchdown";
103 anchors.fill: parent;
103 anchors.fill: parent;
104− radius: "medium";
104+ radius: "small";
105 borderSource: "radius_pressed.sci"
105 borderSource: "radius_pressed.sci"
106 }
106 }
107}
107}
tests/plugins/Dash/cardcreator/8.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
17 visible: status === Loader.Ready;
17 visible: status === Loader.Ready;
18 sourceComponent: UbuntuShape {
18 sourceComponent: UbuntuShape {
19 objectName: "background";
19 objectName: "background";
20− radius: "medium";
20+ radius: "small";
21 aspect: {
21 aspect: {
22 switch (root.backgroundShapeStyle) {
22 switch (root.backgroundShapeStyle) {
23 case "inset": return UbuntuShape.Inset;
23 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/9.res+2−2
@@ -73,7 +73,7 @@ CardAudioProgress {
73 UbuntuShape {
73 UbuntuShape {
74 anchors.fill: parent;
74 anchors.fill: parent;
75 visible: parent.pressed;
75 visible: parent.pressed;
76− radius: "medium";
76+ radius: "small";
77 }
77 }
78 Rectangle {
78 Rectangle {
79 color: Qt.rgba(0, 0, 0, 0.5);
79 color: Qt.rgba(0, 0, 0, 0.5);
@@ -112,7 +112,7 @@ CardAudioProgress {
112 sourceComponent: UbuntuShape {
112 sourceComponent: UbuntuShape {
113 objectName: "touchdown";
113 objectName: "touchdown";
114 anchors.fill: parent;
114 anchors.fill: parent;
115− radius: "medium";
115+ radius: "small";
116 borderSource: "radius_pressed.sci"
116 borderSource: "radius_pressed.sci"
117 }
117 }
118}
118}
tests/plugins/Dash/cardcreator/9.res.cardcreator+1−1
@@ -72,7 +72,7 @@ CardAudioProgress {
72 UbuntuShape {
72 UbuntuShape {
73 anchors.fill: parent;
73 anchors.fill: parent;
74 visible: parent.pressed;
74 visible: parent.pressed;
75− radius: "medium";
75+ radius: "small";
76 }
76 }
77 Rectangle {
77 Rectangle {
78 color: Qt.rgba(0, 0, 0, 0.5);
78 color: Qt.rgba(0, 0, 0, 0.5);