FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(flexbox-ios): resolve text size issue for ListView with flexbox layout template by ADjenkov · Pull Request #5799 · NativeScript/NativeScript · GitHub

/ NativeScript Public

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtopuzov merged 8 commits into from
May 25, 2018
Conversation 3 Commits 8 Checks 0 Files changed
Merged

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

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
63aa954
fix(flexbox-layout-ios): resolve text size issue for ListView with fl…
May 8, 2018
0e7f070
fix(flexbox-layout-ios): resolve text size issue for ListView
May 16, 2018
3294a89
Merge branch 'master' into djenkov/flex-box-stretch
ADjenkov May 17, 2018
2f548b8
Merge branch 'master' into djenkov/flex-box-stretch
ADjenkov May 18, 2018
235a58c
Merge branch 'master' into djenkov/flex-box-stretch
ADjenkov May 21, 2018
d97c47b
Merge branch 'master' into djenkov/flex-box-stretch
ADjenkov May 22, 2018
3bcd882
Merge branch 'master' into djenkov/flex-box-stretch
dtopuzov May 22, 2018
afd9bc9
Merge branch 'master' into djenkov/flex-box-stretch
dtopuzov May 23, 2018
File filter

Filter by extension

Filter by extension .ts  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
14 changes: 12 additions & 2 deletions tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
// As a result we cannot unconditionally measure with EXACTLY the current measured height
const childHeightMeasureSpec = FlexboxLayout.getChildMeasureSpec(this._currentHeightMeasureSpec,
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.effectiveMinWidth = minWidth;
Expand Down Expand Up @@ -820,7 +820,17 @@ export class FlexboxLayout extends FlexboxLayoutBase {
private _stretchViewVertically(view: View, crossSize: number) {
let newHeight = crossSize - view.effectiveMarginTop - view.effectiveMarginBottom;
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) {
Expand Down
Back | FazBrowse Home | New Git URL