git.iko.soy/unity8
on xenial help sign in
Small radius on cards
commitdfe21d6523b9f4ec165e993376ba0909ced2c476 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 3 Oct 2016, 14:14 (10 years ago) parent0220465
22 files changed+34−34
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js+5−5 tests/plugins/Dash/cardcreator/1.res+2−2 tests/plugins/Dash/cardcreator/1.res.cardcreator+1−1 tests/plugins/Dash/cardcreator/10.res+1−1 tests/plugins/Dash/cardcreator/10.res.cardcreator+1−1 tests/plugins/Dash/cardcreator/11.res+3−3 tests/plugins/Dash/cardcreator/11.res.cardcreator+2−2 tests/plugins/Dash/cardcreator/12.res+2−2 tests/plugins/Dash/cardcreator/12.res.cardcreator+1−1 tests/plugins/Dash/cardcreator/2.res+1−1 tests/plugins/Dash/cardcreator/2.res.cardcreator+1−1 tests/plugins/Dash/cardcreator/4.res+1−1 tests/plugins/Dash/cardcreator/5.res+1−1 tests/plugins/Dash/cardcreator/5.res.cardcreator+1−1 tests/plugins/Dash/cardcreator/6.res+2−2 tests/plugins/Dash/cardcreator/6.res.cardcreator+1−1 tests/plugins/Dash/cardcreator/7.res+1−1 tests/plugins/Dash/cardcreator/7.res.cardcreator+1−1 tests/plugins/Dash/cardcreator/8.res+2−2 tests/plugins/Dash/cardcreator/8.res.cardcreator+1−1 tests/plugins/Dash/cardcreator/9.res+2−2 tests/plugins/Dash/cardcreator/9.res.cardcreator+1−1
plugins/Dash/CardCreator.js+5−5
@@ -28,7 +28,7 @@ var kBackgroundLoaderCode = 'Loader {\n\
2828 visible: status === Loader.Ready; \n\
2929 sourceComponent: UbuntuShape { \n\
3030 objectName: "background"; \n\
31− radius: "medium"; \n\
31+ radius: "small"; \n\
3232 aspect: { \n\
3333 switch (root.backgroundShapeStyle) { \n\
3434 case "inset": return UbuntuShape.Inset; \n\
@@ -64,7 +64,7 @@ var kArtUbuntuShapeCode = 'UbuntuShape { \n\
6464 anchors.fill: parent; \n\
6565 source: artImage; \n\
6666 sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\
67− radius: "medium"; \n\
67+ radius: "small"; \n\
6868 aspect: %1; \n\
6969 }';
7070
@@ -166,7 +166,7 @@ var kAudioButtonCode = 'AbstractButton { \n\
166166 UbuntuShape { \n\
167167 anchors.fill: parent; \n\
168168 visible: parent.pressed; \n\
169− radius: "medium"; \n\
169+ radius: "small"; \n\
170170 } \n\
171171 Rectangle { \n\
172172 color: Qt.rgba(0, 0, 0, 0.5); \n\
@@ -214,7 +214,7 @@ var kOverlayLoaderCode = 'Loader { \n\
214214 id: overlay; \n\
215215 property real luminance: Style.luminance(overlayColor); \n\
216216 aspect: UbuntuShape.Flat; \n\
217− radius: "medium"; \n\
217+ radius: "small"; \n\
218218 overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
219219 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\
220220 } \n\
@@ -337,7 +337,7 @@ var kTouchdownCode = 'Loader { \n\
337337 sourceComponent: UbuntuShape { \n\
338338 objectName: "touchdown"; \n\
339339 anchors.fill: parent; \n\
340− radius: "medium"; \n\
340+ radius: "small"; \n\
341341 borderSource: "radius_pressed.sci" \n\
342342 } \n\
343343 }\n';
tests/plugins/Dash/cardcreator/1.res+2−2
@@ -31,7 +31,7 @@ Loader {
3131 anchors.fill: parent;
3232 source: artImage;
3333 sourceFillMode: UbuntuShape.PreserveAspectCrop;
34− radius: "medium";
34+ radius: "small";
3535 aspect: UbuntuShape.Flat;
3636 }
3737 width: root.fixedArtShapeSize.width;
@@ -74,7 +74,7 @@ Loader {
7474 sourceComponent: UbuntuShape {
7575 objectName: "touchdown";
7676 anchors.fill: parent;
77− radius: "medium";
77+ radius: "small";
7878 borderSource: "radius_pressed.sci"
7979 }
8080}
tests/plugins/Dash/cardcreator/1.res.cardcreator+1−1
@@ -28,7 +28,7 @@ Loader {
2828 anchors.fill: parent;
2929 source: artImage;
3030 sourceFillMode: UbuntuShape.PreserveAspectCrop;
31− radius: "medium";
31+ radius: "small";
3232 aspect: UbuntuShape.Flat;
3333 }
3434 width: image.status !== Image.Ready ? 0 : image.width;
tests/plugins/Dash/cardcreator/10.res+1−1
@@ -19,7 +19,7 @@ Loader {
1919 visible: status === Loader.Ready;
2020 sourceComponent: UbuntuShape {
2121 objectName: "background";
22− radius: "medium";
22+ radius: "small";
2323 aspect: {
2424 switch (root.backgroundShapeStyle) {
2525 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/10.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
1717 visible: status === Loader.Ready;
1818 sourceComponent: UbuntuShape {
1919 objectName: "background";
20− radius: "medium";
20+ radius: "small";
2121 aspect: {
2222 switch (root.backgroundShapeStyle) {
2323 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/11.res+3−3
@@ -19,7 +19,7 @@ Loader {
1919 visible: status === Loader.Ready;
2020 sourceComponent: UbuntuShape {
2121 objectName: "background";
22− radius: "medium";
22+ radius: "small";
2323 aspect: {
2424 switch (root.backgroundShapeStyle) {
2525 case "inset": return UbuntuShape.Inset;
@@ -69,7 +69,7 @@ Loader {
6969 anchors.fill: parent;
7070 source: artImage;
7171 sourceFillMode: UbuntuShape.PreserveAspectCrop;
72− radius: "medium";
72+ radius: "small";
7373 aspect: UbuntuShape.Flat;
7474 }
7575 width: root.fixedArtShapeSize.width;
@@ -168,7 +168,7 @@ Loader {
168168 sourceComponent: UbuntuShape {
169169 objectName: "touchdown";
170170 anchors.fill: parent;
171− radius: "medium";
171+ radius: "small";
172172 borderSource: "radius_pressed.sci"
173173 }
174174}
tests/plugins/Dash/cardcreator/11.res.cardcreator+2−2
@@ -17,7 +17,7 @@ Loader {
1717 visible: status === Loader.Ready;
1818 sourceComponent: UbuntuShape {
1919 objectName: "background";
20− radius: "medium";
20+ radius: "small";
2121 aspect: {
2222 switch (root.backgroundShapeStyle) {
2323 case "inset": return UbuntuShape.Inset;
@@ -66,7 +66,7 @@ Loader {
6666 anchors.fill: parent;
6767 source: artImage;
6868 sourceFillMode: UbuntuShape.PreserveAspectCrop;
69− radius: "medium";
69+ radius: "small";
7070 aspect: UbuntuShape.Flat;
7171 }
7272 width: image.status !== Image.Ready ? 0 : image.width;
tests/plugins/Dash/cardcreator/12.res+2−2
@@ -31,7 +31,7 @@ Loader {
3131 anchors.fill: parent;
3232 source: artImage;
3333 sourceFillMode: UbuntuShape.PreserveAspectCrop;
34− radius: "medium";
34+ radius: "small";
3535 aspect: UbuntuShape.Flat;
3636 }
3737 width: root.fixedArtShapeSize.width;
@@ -100,7 +100,7 @@ Loader {
100100 sourceComponent: UbuntuShape {
101101 objectName: "touchdown";
102102 anchors.fill: parent;
103− radius: "medium";
103+ radius: "small";
104104 borderSource: "radius_pressed.sci"
105105 }
106106}
tests/plugins/Dash/cardcreator/12.res.cardcreator+1−1
@@ -28,7 +28,7 @@ Loader {
2828 anchors.fill: parent;
2929 source: artImage;
3030 sourceFillMode: UbuntuShape.PreserveAspectCrop;
31− radius: "medium";
31+ radius: "small";
3232 aspect: UbuntuShape.Flat;
3333 }
3434 width: image.status !== Image.Ready ? 0 : image.width;
tests/plugins/Dash/cardcreator/2.res+1−1
@@ -19,7 +19,7 @@ Loader {
1919 visible: status === Loader.Ready;
2020 sourceComponent: UbuntuShape {
2121 objectName: "background";
22− radius: "medium";
22+ radius: "small";
2323 aspect: {
2424 switch (root.backgroundShapeStyle) {
2525 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/2.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
1717 visible: status === Loader.Ready;
1818 sourceComponent: UbuntuShape {
1919 objectName: "background";
20− radius: "medium";
20+ radius: "small";
2121 aspect: {
2222 switch (root.backgroundShapeStyle) {
2323 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/4.res+1−1
@@ -103,7 +103,7 @@ Loader {
103103 sourceComponent: UbuntuShape {
104104 objectName: "touchdown";
105105 anchors.fill: parent;
106− radius: "medium";
106+ radius: "small";
107107 borderSource: "radius_pressed.sci"
108108 }
109109}
tests/plugins/Dash/cardcreator/5.res+1−1
@@ -51,7 +51,7 @@ Loader {
5151 id: overlay;
5252 property real luminance: Style.luminance(overlayColor);
5353 aspect: UbuntuShape.Flat;
54− radius: "medium";
54+ radius: "small";
5555 overlayColor: cardData && cardData["overlayColor"] || "#99000000";
5656 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1);
5757 }
tests/plugins/Dash/cardcreator/5.res.cardcreator+1−1
@@ -48,7 +48,7 @@ Loader {
4848 id: overlay;
4949 property real luminance: Style.luminance(overlayColor);
5050 aspect: UbuntuShape.Flat;
51− radius: "medium";
51+ radius: "small";
5252 overlayColor: cardData && cardData["overlayColor"] || "#99000000";
5353 overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1);
5454 }
tests/plugins/Dash/cardcreator/6.res+2−2
@@ -19,7 +19,7 @@ Loader {
1919 visible: status === Loader.Ready;
2020 sourceComponent: UbuntuShape {
2121 objectName: "background";
22− radius: "medium";
22+ radius: "small";
2323 aspect: {
2424 switch (root.backgroundShapeStyle) {
2525 case "inset": return UbuntuShape.Inset;
@@ -119,7 +119,7 @@ Loader {
119119 sourceComponent: UbuntuShape {
120120 objectName: "touchdown";
121121 anchors.fill: parent;
122− radius: "medium";
122+ radius: "small";
123123 borderSource: "radius_pressed.sci"
124124 }
125125}
tests/plugins/Dash/cardcreator/6.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
1717 visible: status === Loader.Ready;
1818 sourceComponent: UbuntuShape {
1919 objectName: "background";
20− radius: "medium";
20+ radius: "small";
2121 aspect: {
2222 switch (root.backgroundShapeStyle) {
2323 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/7.res+1−1
@@ -19,7 +19,7 @@ Loader {
1919 visible: status === Loader.Ready;
2020 sourceComponent: UbuntuShape {
2121 objectName: "background";
22− radius: "medium";
22+ radius: "small";
2323 aspect: {
2424 switch (root.backgroundShapeStyle) {
2525 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/7.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
1717 visible: status === Loader.Ready;
1818 sourceComponent: UbuntuShape {
1919 objectName: "background";
20− radius: "medium";
20+ radius: "small";
2121 aspect: {
2222 switch (root.backgroundShapeStyle) {
2323 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/8.res+2−2
@@ -19,7 +19,7 @@ Loader {
1919 visible: status === Loader.Ready;
2020 sourceComponent: UbuntuShape {
2121 objectName: "background";
22− radius: "medium";
22+ radius: "small";
2323 aspect: {
2424 switch (root.backgroundShapeStyle) {
2525 case "inset": return UbuntuShape.Inset;
@@ -101,7 +101,7 @@ Loader {
101101 sourceComponent: UbuntuShape {
102102 objectName: "touchdown";
103103 anchors.fill: parent;
104− radius: "medium";
104+ radius: "small";
105105 borderSource: "radius_pressed.sci"
106106 }
107107}
tests/plugins/Dash/cardcreator/8.res.cardcreator+1−1
@@ -17,7 +17,7 @@ Loader {
1717 visible: status === Loader.Ready;
1818 sourceComponent: UbuntuShape {
1919 objectName: "background";
20− radius: "medium";
20+ radius: "small";
2121 aspect: {
2222 switch (root.backgroundShapeStyle) {
2323 case "inset": return UbuntuShape.Inset;
tests/plugins/Dash/cardcreator/9.res+2−2
@@ -73,7 +73,7 @@ CardAudioProgress {
7373 UbuntuShape {
7474 anchors.fill: parent;
7575 visible: parent.pressed;
76− radius: "medium";
76+ radius: "small";
7777 }
7878 Rectangle {
7979 color: Qt.rgba(0, 0, 0, 0.5);
@@ -112,7 +112,7 @@ CardAudioProgress {
112112 sourceComponent: UbuntuShape {
113113 objectName: "touchdown";
114114 anchors.fill: parent;
115− radius: "medium";
115+ radius: "small";
116116 borderSource: "radius_pressed.sci"
117117 }
118118}
tests/plugins/Dash/cardcreator/9.res.cardcreator+1−1
@@ -72,7 +72,7 @@ CardAudioProgress {
7272 UbuntuShape {
7373 anchors.fill: parent;
7474 visible: parent.pressed;
75− radius: "medium";
75+ radius: "small";
7676 }
7777 Rectangle {
7878 color: Qt.rgba(0, 0, 0, 0.5);