javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Border width cannot be reset to 0 on IOS

Browse Source
This commit is contained in:
zh-m
2016-11-24 18:10:13 +02:00
parent 2e13205797
commit aa91b0eca0
4 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/app/ui-tests-app/issues/issue-3164.ts Normal file
View File

@ -0,0 +1,29 @@
import { Color } from "color";
import { EventData } from "data/observable";
import { Page } from "ui/page";
var page: Page;
var borderColor : Color = new Color("#ff0000");
export function navigatingTo(args: EventData) {
page = <Page>args.object;
}
export function onSetBorderWidthTo0() {
let buttonElement = page.getViewById("button1");
buttonElement.borderColor = borderColor;
buttonElement.borderWidth = 0;
let labelElement = page.getViewById("label1");
labelElement.borderColor = borderColor;
labelElement.borderWidth = 0;
}
export function onSetBorderWidthTo3() {
let buttonElement = page.getViewById("button1");
buttonElement.borderColor = borderColor;
buttonElement.borderWidth = 3;
let labelElement = page.getViewById("label1");
labelElement.borderColor = borderColor;
labelElement.borderWidth = 3;
}

9
apps/app/ui-tests-app/issues/issue-3164.xml Normal file
View File

@ -0,0 +1,9 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo">
<StackLayout>
<Button id="button1" text="Shosho button" margin="10"/>
<Label id="label1" text="Shosho label" margin="10"/>
<Button text="1. Set border width to 3" tap="onSetBorderWidthTo3" />
<Button text="2. Set border width to 0" tap="onSetBorderWidthTo0" />
</StackLayout>
</Page>

1
apps/app/ui-tests-app/issues/main-page.ts
View File

@ -17,6 +17,7 @@ export function pageLoaded(args: EventData) {
examples.set("3007", "issues/issue-3007"); examples.set("3007", "issues/issue-3007");
examples.set("2661", "issues/issue-2661"); examples.set("2661", "issues/issue-2661");
examples.set("3113", "issues/issue-3113"); examples.set("3113", "issues/issue-3113");
examples.set("3164", "issues/issue-3164");
let viewModel = new SubMainPageViewModel(wrapLayout, examples); let viewModel = new SubMainPageViewModel(wrapLayout, examples);
page.bindingContext = viewModel; page.bindingContext = viewModel;

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

@ -22,16 +22,6 @@ export module ios {
} }
ensureStyle(); ensureStyle();
let background = <common.Background>view.style._getValue(style.backgroundInternalProperty);
if (!background || background.isEmpty()) {
return undefined;
}
// Clip-path
if (background.clipPath) {
drawClipPath(nativeView, background);
}
// Borders // Borders
// Clear all borders // Clear all borders
@ -56,6 +46,16 @@ export module ios {
(<CAShapeLayer>nativeView["leftBorderLayer"]).removeFromSuperlayer(); (<CAShapeLayer>nativeView["leftBorderLayer"]).removeFromSuperlayer();
} }
let background = <common.Background>view.style._getValue(style.backgroundInternalProperty);
if (!background || background.isEmpty()) {
return undefined;
}
// Clip-path
if (background.clipPath) {
drawClipPath(nativeView, background);
}
if (background.hasUniformBorder()){ if (background.hasUniformBorder()){
let borderColor = background.getUniformBorderColor(); let borderColor = background.getUniformBorderColor();
if (borderColor && borderColor.ios){ if (borderColor && borderColor.ios){