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

fix(scroll-view): apply insets to layoutChild method

Browse Source 
Delete `*-nav-page.*` files reproducing the issue.
Update `home-page.xml` with `ScrollView` to reproduce the issue.
This commit is contained in:
Vasil Chimev
2018-07-30 18:46:49 +03:00
committed by Martin Yankov
parent a1d240786f
commit 52f8e67203
5 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/safe-area/app/home/home-page.xml
View File

@@ -4,12 +4,14 @@
<Label class="action-bar-title" text="Home"></Label> <Label class="action-bar-title" text="Home"></Label>
</ActionBar> </ActionBar>
<ScrollView>
<StackLayout> <StackLayout>
<Button text="Component Examples" tap="onNavigate" route="component/component-page"></Button> <Button text="Component Examples" tap="onNavigate" route="component/component-page"></Button>
<Button text="GridLayout Examples" tap="onNavigate" route="gridlayout/gridlayout-page"></Button> <Button text="GridLayout Examples" tap="onNavigate" route="gridlayout/gridlayout-page"></Button>
<Button text="ScrollView Examples" tap="onNavigate" route="scrollview/scrollview-page"></Button> <Button text="ScrollView Examples" tap="onNavigate" route="scrollview/scrollview-page"></Button>
<Button text="ListView Examples" tap="onNavigate" route="listview/listview-page" /> <Button text="ListView Examples" tap="onNavigate" route="listview/listview-page" />
<Button text="WrapLayout Examples" tap="onNavigate" route="wraplayout/wraplayout-page"></Button> <Button text="WrapLayout Examples" tap="onNavigate" route="wraplayout/wraplayout-page"></Button>
<Button text="Navigation" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-nav-page"></Button>
</StackLayout> </StackLayout>
</ScrollView>
</Page> </Page>

12
e2e/safe-area/app/scrollview/action-bar/vscroll-hwrap-nav-page.xml
View File

@@ -1,12 +0,0 @@
<Page class="page"
xmlns="http://schemas.nativescript.org/tns.xsd">
<ScrollView orientation="vertical">
<WrapLayout orientation="horizontal">
<Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="green"></Button>
<Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
<Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
<Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
</WrapLayout>
</ScrollView>
</Page>

10
e2e/safe-area/app/wraplayout/no-action-bar/hwrap-nav-page.ts
View File

@@ -1,10 +0,0 @@
import { View, EventData } from "tns-core-modules/ui/core/view/view";
import * as frame from "tns-core-modules/ui/frame";
export function onNavigate(args: EventData) {
const view = args.object as View;
const route = view["route"];
// view.page.frame.navigate(route);
frame.topmost().navigate(route);
}

10
e2e/safe-area/app/wraplayout/no-action-bar/hwrap-nav-page.xml
View File

@@ -1,10 +0,0 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd"
xmlns:fragments="wraplayout/fragments" actionBarHidden="true">
<WrapLayout orientation="horizontal" backgroundColor="LightGreen">
<Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"
backgroundColor="Green" tap="onNavigate" route="scrollview/action-bar/vscroll-hwrap-nav-page"></Button>
<Button text="H" backgroundColor="Pink"></Button>
</WrapLayout>
</Page>

2
tns-core-modules/ui/scroll-view/scroll-view.ios.ts
View File

@@ -186,7 +186,7 @@ export class ScrollView extends ScrollViewBase {
} }
nativeView.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(width), layout.toDeviceIndependentPixels(height)); nativeView.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(width), layout.toDeviceIndependentPixels(height));
View.layoutChild(this, this.layoutView, 0, 0, width, height); View.layoutChild(this, this.layoutView, insets.left, insets.top, width, height);
// if (this.orientation === "horizontal") { // if (this.orientation === "horizontal") {
// nativeView.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(this._contentMeasuredWidth + insets.left + insets.right), layout.toDeviceIndependentPixels(height)); // nativeView.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(this._contentMeasuredWidth + insets.left + insets.right), layout.toDeviceIndependentPixels(height));