javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-18 22:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(flexbox-ios): resolve text size issue for ListView with flexbox layout template (#5799)

Browse Source 
* fix(flexbox-layout-ios): resolve text size issue for ListView with flexbox template

* fix(flexbox-layout-ios): resolve text size issue for ListView
This commit is contained in:
Alexander Djenkov
2018-05-25 11:43:00 +03:00
committed by Dimitar Topuzov
parent 7851629a27
commit a03065c527
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
View File

@ -604,7 +604,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
// As a result we cannot unconditionally measure with EXACTLY the current measured height // As a result we cannot unconditionally measure with EXACTLY the current measured height
const childHeightMeasureSpec = FlexboxLayout.getChildMeasureSpec(this._currentHeightMeasureSpec, const childHeightMeasureSpec = FlexboxLayout.getChildMeasureSpec(this._currentHeightMeasureSpec,
lp.effectivePaddingTop + lp.effectivePaddingBottom + lp.effectiveMarginTop lp.effectivePaddingTop + lp.effectivePaddingBottom + lp.effectiveMarginTop
+ lp.effectiveMarginBottom, lp.effectiveHeight < 0 ? WRAP_CONTENT : lp.effectiveHeight); + lp.effectiveMarginBottom, lp.effectiveHeight < 0 ? WRAP_CONTENT : lp.effectiveHeight);
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
child.effectiveMinWidth = minWidth; child.effectiveMinWidth = minWidth;
@ -820,7 +820,17 @@ export class FlexboxLayout extends FlexboxLayoutBase {
private _stretchViewVertically(view: View, crossSize: number) { private _stretchViewVertically(view: View, crossSize: number) {
let newHeight = crossSize - view.effectiveMarginTop - view.effectiveMarginBottom; let newHeight = crossSize - view.effectiveMarginTop - view.effectiveMarginBottom;
newHeight = Math.max(newHeight, 0); newHeight = Math.max(newHeight, 0);
view.measure(makeMeasureSpec(view.getMeasuredWidth(), EXACTLY), makeMeasureSpec(newHeight, EXACTLY)); let originalMeasuredWidth = view.getMeasuredWidth();
let childWidthMeasureSpec = FlexboxLayout.getChildMeasureSpec(this._currentWidthMeasureSpec,
view.effectivePaddingLeft + view.effectivePaddingRight + view.effectiveMarginLeft
+ view.effectiveMarginRight, view.effectiveWidth < 0 ? WRAP_CONTENT : Math.min(view.effectiveWidth, originalMeasuredWidth));
view.measure(childWidthMeasureSpec, makeMeasureSpec(newHeight, EXACTLY));
if (originalMeasuredWidth > view.getMeasuredWidth()) {
childWidthMeasureSpec = makeMeasureSpec(originalMeasuredWidth, EXACTLY);
view.measure(childWidthMeasureSpec, makeMeasureSpec(newHeight, EXACTLY));
}
} }
private _stretchViewHorizontally(view: View, crossSize: number) { private _stretchViewHorizontally(view: View, crossSize: number) {