javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3130 from NativeScript/issue-3113

Browse Source 
Fix: Transparent border rendered as black
This commit is contained in:
Rossen Hristov
2016-11-21 13:08:27 +02:00
committed by GitHub
parent 978bd8c524 30d202b5f1
commit 538c88cc82
7 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app/ui-tests-app/issues/issue-3113.css Normal file
View File

@ -0,0 +1,13 @@
#button1 {
border-color: rgba(0, 0, 0, 0);
border-width: 3;
}
#button2 {
border-color: rgba(0, 0, 0, 0.5);
border-width: 3;
}
#button3 {
border-width: 3;
}

7
apps/app/ui-tests-app/issues/issue-3113.xml Normal file
View File

@ -0,0 +1,7 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
<StackLayout>
<Button id="button1" text="transparent"/>
<Button id="button2" text="semi-transparent"/>
<Button id="button3" text="no-color"/>
</StackLayout>
</Page>

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

@ -16,6 +16,7 @@ export function pageLoaded(args: EventData) {
examples.set("2942", "issues/issue-2942"); examples.set("2942", "issues/issue-2942");
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");
let viewModel = new SubMainPageViewModel(wrapLayout, examples); let viewModel = new SubMainPageViewModel(wrapLayout, examples);
page.bindingContext = viewModel; page.bindingContext = viewModel;

6
apps/package.json
View File

@ -6,14 +6,14 @@
"nativescript": { "nativescript": {
"id": "org.nativescript.apps", "id": "org.nativescript.apps",
"tns-ios": { "tns-ios": {
"version": "2.3.0" "version": "2.4.0"
}, },
"tns-android": { "tns-android": {
"version": "2.3.0" "version": "2.4.0"
} }
}, },
"dependencies": { "dependencies": {
"tns-core-modules": "2.1.0" "tns-core-modules": "2.4.0"
}, },
"devDependencies": { "devDependencies": {
"tns-platform-declarations": "*", "tns-platform-declarations": "*",

36
tests/app/ui/tab-view/tab-view-tests.ts
View File

@ -306,27 +306,27 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
// TKUnit.assertTrue(viewsWithoutParent > viewsWithParent, `Most of the views should be recycled: viewsWithoutParent = ${viewsWithoutParent}; viewsWithParent = ${viewsWithParent};`); // TKUnit.assertTrue(viewsWithoutParent > viewsWithParent, `Most of the views should be recycled: viewsWithoutParent = ${viewsWithoutParent}; viewsWithParent = ${viewsWithParent};`);
// } // }
public testAndroidOffscreenTabLimit_KeepAllAlive = function () { // public testAndroidOffscreenTabLimit_KeepAllAlive = function () {
let tabView = this.testView; // let tabView = this.testView;
if (!tabView.android){ // if (!tabView.android){
return; // return;
} // }
tabView.androidOffscreenTabLimit = 20; // tabView.androidOffscreenTabLimit = 20;
tabView.items = this._createItems(20); // tabView.items = this._createItems(20);
this.waitUntilTestElementIsLoaded(); // this.waitUntilTestElementIsLoaded();
for (let index = 0, length = tabView.items.length; index < length; index++){ // for (let index = 0, length = tabView.items.length; index < length; index++){
tabViewTestsNative.selectNativeTab(tabView, index); // tabViewTestsNative.selectNativeTab(tabView, index);
TKUnit.waitUntilReady(function () { // TKUnit.waitUntilReady(function () {
return tabView.selectedIndex === index; // return tabView.selectedIndex === index;
}, helper.ASYNC); // }, helper.ASYNC);
} // }
for (let i = 0, length = tabView.items.length; i < length; i++){ // for (let i = 0, length = tabView.items.length; i < length; i++){
TKUnit.assertNotNull(tabView.items[i].view.parent, `tabView.items[${i}].view should have a parent!`); // TKUnit.assertNotNull(tabView.items[i].view.parent, `tabView.items[${i}].view should have a parent!`);
} // }
} // }
/* /*
public testBindingIsRefreshedWhenTabViewItemIsUnselectedAndThenSelectedAgain() { public testBindingIsRefreshedWhenTabViewItemIsUnselectedAndThenSelectedAgain() {

6
tests/package.json
View File

@ -6,14 +6,14 @@
"nativescript": { "nativescript": {
"id": "org.nativescript.tests", "id": "org.nativescript.tests",
"tns-ios": { "tns-ios": {
"version": "2.3.0" "version": "2.4.0"
}, },
"tns-android": { "tns-android": {
"version": "2.3.0" "version": "2.4.0"
} }
}, },
"dependencies": { "dependencies": {
"tns-core-modules": "2.3.0" "tns-core-modules": "2.4.0"
}, },
"devDependencies": { "devDependencies": {
"tns-platform-declarations": "*", "tns-platform-declarations": "*",

8
tns-core-modules/ui/styling/background.android.ts
View File

@ -154,10 +154,10 @@ function refreshBorderDrawable(view: view.View, borderDrawable: org.nativescript
borderDrawable.refresh( borderDrawable.refresh(
(background.borderTopColor && background.borderTopColor.android) ? background.borderTopColor.android : 0, (!types.isNullOrUndefined(background.borderTopColor) && !types.isNullOrUndefined(background.borderTopColor.android)) ? background.borderTopColor.android : android.graphics.Color.BLACK,
(background.borderRightColor && background.borderRightColor.android) ? background.borderRightColor.android : 0, (!types.isNullOrUndefined(background.borderRightColor) && !types.isNullOrUndefined(background.borderRightColor.android)) ? background.borderRightColor.android : android.graphics.Color.BLACK,
(background.borderBottomColor && background.borderBottomColor.android) ? background.borderBottomColor.android : 0, (!types.isNullOrUndefined(background.borderBottomColor) && !types.isNullOrUndefined(background.borderBottomColor.android)) ? background.borderBottomColor.android : android.graphics.Color.BLACK,
(background.borderLeftColor && background.borderLeftColor.android) ? background.borderLeftColor.android : 0, (!types.isNullOrUndefined(background.borderLeftColor) && !types.isNullOrUndefined(background.borderLeftColor.android)) ? background.borderLeftColor.android : android.graphics.Color.BLACK,
background.borderTopWidth, background.borderTopWidth,
background.borderRightWidth, background.borderRightWidth,