javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 19:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(css-bkg-pos): Added possibility to declare background pos by single numeric value (#7958)

Browse Source 
* feat(css-bkg-pos): Added possibility to declare background pos by single numeric value

* feat(css-bkg-pos): Implemented numeric bkg pos for iOS

* feat(css-bkg-pos): removed unnecessary code

Co-authored-by: Vasil Trifonov <v.trifonov@gmail.com>
This commit is contained in:
Nicu
2020-03-24 10:17:35 +02:00
committed by GitHub
parent 42fc4acea3
commit 1f04469fb3
2 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
nativescript-core/ui/styling/background.ios.ts
View File

@ -204,18 +204,23 @@ function parsePosition(pos: string): { x: CSSValue, y: CSSValue } {
return { x: values[0], y: values[1] }; return { x: values[0], y: values[1] };
} }
if (values.length === 1 && values[0].type === "ident") { if (values.length === 1) {
const val = values[0].string.toLocaleLowerCase(); const center = { type: "ident", string: "center" };
const center = { type: "ident", string: "center" };
// If you only one keyword is specified, the other value is "center" if (values[0].type === "ident") {
if (val === "left" || val === "right") { const val = values[0].string.toLocaleLowerCase();
return { x: values[0], y: center };
} else if (val === "top" || val === "bottom") { // If you only one keyword is specified, the other value is "center"
return { x: center, y: values[0] }; if (val === "left" || val === "right") {
} else if (val === "center") { return { x: values[0], y: center };
return { x: center, y: center }; } else if (val === "top" || val === "bottom") {
} return { x: center, y: values[0] };
} else if (val === "center") {
return { x: center, y: center };
}
} else if (values[0].type === "number") {
return {x: values[0], y: center};
}
} }
return null; return null;
@ -322,6 +327,18 @@ function getDrawParams(this: void, image: UIImage, background: BackgroundDefinit
} else if (v.y.string.toLowerCase() === "bottom") { } else if (v.y.string.toLowerCase() === "bottom") {
res.posY = spaceY; res.posY = spaceY;
} }
} else if (v.x.type === "number" && v.y.type === "ident") {
if (v.x.unit === "%") {
res.posX = spaceX * v.x.value / 100;
} else if (v.x.unit === "px" || v.x.unit === "") {
res.posX = v.x.value;
}
if (v.y.string.toLowerCase() === "center") {
res.posY = spaceY / 2;
} else if (v.y.string.toLowerCase() === "bottom") {
res.posY = spaceY;
}
} }
} }
} }

33
tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
View File

@ -713,6 +713,18 @@ public class BorderDrawable extends ColorDrawable implements BitmapOwner {
res.posX = spaceX; res.posX = spaceX;
} }
if ("center".equals(vy.getString().toLowerCase(Locale.ENGLISH))) {
res.posY = spaceY / 2;
} else if ("bottom".equals(vy.getString().toLowerCase(Locale.ENGLISH))) {
res.posY = spaceY;
}
} else if ("number".equals(vx.getType()) && "ident".equals(vy.getType())) {
if ("%".equals(vx.getUnit())) {
res.posX = spaceX * vx.getValue() / 100;
} else if ("px".equals(vx.getUnit()) || vx.getUnit() == null || vx.getUnit().isEmpty()) {
res.posX = vx.getValue();
}
if ("center".equals(vy.getString().toLowerCase(Locale.ENGLISH))) { if ("center".equals(vy.getString().toLowerCase(Locale.ENGLISH))) {
res.posY = spaceY / 2; res.posY = spaceY / 2;
} else if ("bottom".equals(vy.getString().toLowerCase(Locale.ENGLISH))) { } else if ("bottom".equals(vy.getString().toLowerCase(Locale.ENGLISH))) {
@ -731,17 +743,22 @@ public class BorderDrawable extends ColorDrawable implements BitmapOwner {
} }
CSSValue[] result = null; CSSValue[] result = null;
if (values.length == 1 && "ident".equals(values[0].getType())) { if (values.length == 1) {
String val = values[0].getString().toLowerCase(Locale.ENGLISH); // If you only one keyword is specified, the other value is "center"
CSSValue center = new CSSValue("ident", "center", null, 0); CSSValue center = new CSSValue("ident", "center", null, 0);
// If you only one keyword is specified, the other value is "center" if ("ident".equals(values[0].getType())) {
if ("left".equals(val) || "right".equals(val)) { String val = values[0].getString().toLowerCase(Locale.ENGLISH);
if ("left".equals(val) || "right".equals(val)) {
result = new CSSValue[]{values[0], center};
} else if ("top".equals(val) || "bottom".equals(val)) {
result = new CSSValue[]{center, values[0]};
} else if ("center".equals(val)) {
result = new CSSValue[]{center, center};
}
} else if ("number".equals(values[0].getType())) {
result = new CSSValue[]{values[0], center}; result = new CSSValue[]{values[0], center};
} else if ("top".equals(val) || "bottom".equals(val)) {
result = new CSSValue[]{center, values[0]};
} else if ("center".equals(val)) {
result = new CSSValue[]{center, center};
} }
} }