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

Padding fix for stack-layout and tests

Browse Source
This commit is contained in:
vakrilov
2015-03-06 14:46:12 +02:00
parent 424565249b
commit 2e6b041b57
8 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/tests/layouts/absolute-layout-tests.ts
View File

@@ -73,6 +73,7 @@ export function test_padding() {
return absoluteLayout.isLayoutValid;
}, 1);
layoutHelper.assertMeasure(btn, 100, 100);
layoutHelper.assertLayout(btn, 25, 35, 100, 100);
});
}

1
apps/tests/layouts/dock-layout-tests.ts
View File

@@ -191,6 +191,7 @@ export function test_padding() {
TKUnit.waitUntilReady(() => { return rootLayout.isLayoutValid; });
helper.assertMeasure(testBtn, 260, 240);
helper.assertLayout(testBtn, 10, 20, 260, 240);
}

1
apps/tests/layouts/grid-layout-tests.ts
View File

@@ -492,6 +492,7 @@ export function test_GridLayout_padding() {
TKUnit.waitUntilReady(() => { return btn.isLayoutValid });
helper.assertMeasure(btn, 260, 240);
helper.assertLayout(btn, 10, 20, 260, 240);
}

9
apps/tests/layouts/layout-helper.ts
View File

@@ -66,6 +66,15 @@ export class MyButton extends button.Button {
}
}
export function assertMeasure(btn: MyButton, width: number, height: number, name?: string) {
var density = utils.layout.getDisplayDensity();
name = name ? "[" + name + "]" : "";
TKUnit.assertAreClose(btn.measureWidth / density, width, DELTA, name + "width");
TKUnit.assertAreClose(btn.measureHeight / density, height, DELTA, name + "height");
}
export function assertLayout(btn: MyButton, left: number, top: number, width: number, height: number, name?: string): void {
var density = utils.layout.getDisplayDensity();

6
apps/tests/layouts/stack-layout-tests.ts
View File

@@ -175,6 +175,9 @@ export function test_StackLayout_Padding_Vertical() {
return btn2.arranged;
}, ASYNC);
helper.assertMeasure(btn1, 260, 50);
helper.assertMeasure(btn1, 260, 50);
helper.assertLayout(btn1, 10, 20, 260, 50, "btn1");
helper.assertLayout(btn2, 10, 70, 260, 50, "btn2");
}
@@ -196,6 +199,9 @@ export function test_StackLayout_Padding_Horizontal() {
return btn2.arranged;
}, ASYNC);
helper.assertMeasure(btn1, 50, 240);
helper.assertMeasure(btn1, 50, 240);
helper.assertLayout(btn1, 10, 20, 50, 240, "btn1");
helper.assertLayout(btn2, 60, 20, 50, 240, "btn2");
}

6
apps/tests/layouts/wrap-layout-tests.ts
View File

@@ -230,6 +230,9 @@ export function testPaddingRight() {
return wrapLayout.isLayoutValid;
});
layoutHelper.assertMeasure(btn1, 100, 50);
layoutHelper.assertMeasure(btn2, 80, 50);
// There should be no space left for the button on the first row,
// because fo the padding (200 - 100 - 30) = 70 button wants 80
layoutHelper.assertLayout(btn1, 0, 0, 100, 50, "button1");
@@ -258,6 +261,9 @@ export function testPaddingBottom() {
return wrapLayout.isLayoutValid;
});
layoutHelper.assertMeasure(btn1, 50, 100);
layoutHelper.assertMeasure(btn2, 50, 80);
// There should be no space left for the button on the first row,
// because fo the padding (200 - 100 - 30) = 70 button wants 80
layoutHelper.assertLayout(btn1, 0, 0, 50, 100, "button1");