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

ios cornder radius is rendered as circle now (#3915)

Browse Source 
* ios cornder radius is rendered as circle now

* fix failing test
This commit is contained in:
Hristo Hristov
2017-03-31 16:18:12 +03:00
committed by GitHub
parent e802206f0e
commit 120230c297
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/app/ui/view/view-tests-common.ts
View File

@@ -818,6 +818,7 @@ export function testBorderWidth() {
export function testCornerRadius() { export function testCornerRadius() {
helper.buildUIAndRunTest(_createLabelWithBorder(), function (views: Array<View>) { helper.buildUIAndRunTest(_createLabelWithBorder(), function (views: Array<View>) {
const lbl = views[0]; const lbl = views[0];
TKUnit.waitUntilReady(() => lbl.isLayoutValid);
const expectedValue = <number>lbl.borderRadius * utils.layout.getDisplayDensity(); const expectedValue = <number>lbl.borderRadius * utils.layout.getDisplayDensity();
const actualValue = definition.getUniformNativeCornerRadius(lbl); const actualValue = definition.getUniformNativeCornerRadius(lbl);
TKUnit.assertAreClose(actualValue, expectedValue, 0.01, "borderRadius"); TKUnit.assertAreClose(actualValue, expectedValue, 0.01, "borderRadius");

4
tns-core-modules/ui/styling/background.ios.ts
View File

@@ -37,7 +37,9 @@ export module ios {
const borderColor = background.getUniformBorderColor(); const borderColor = background.getUniformBorderColor();
layer.borderColor = !borderColor ? undefined : borderColor.ios.CGColor; layer.borderColor = !borderColor ? undefined : borderColor.ios.CGColor;
layer.borderWidth = layout.toDeviceIndependentPixels(background.getUniformBorderWidth()); layer.borderWidth = layout.toDeviceIndependentPixels(background.getUniformBorderWidth());
layer.cornerRadius = layout.toDeviceIndependentPixels(background.getUniformBorderRadius()); const renderSize = view.getActualSize() || { width: 0, height: 0 };
const cornerRadius = layout.toDeviceIndependentPixels(background.getUniformBorderRadius());
layer.cornerRadius = Math.min(Math.min(renderSize.width / 2, renderSize.height / 2), cornerRadius);
} }
else { else {
drawNonUniformBorders(nativeView, background); drawNonUniformBorders(nativeView, background);