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(label): text wrapping inside flexbox layout (#121)

Browse Source 
* fix(ios-label): fix text wrapping in iOS 11
* fix(android): fix label text wrapping inside flexbox layout
This commit is contained in:
Manol Donev
2018-05-08 15:08:25 +03:00
committed by GitHub
parent 3170b8696f
commit a65984f1d5
2 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
android/widgets/src/main/java/org/nativescript/widgets/FlexboxLayout.java
View File

@@ -1071,9 +1071,24 @@ public class FlexboxLayout extends ViewGroup {
} else { } else {
accumulatedRoundError = rawCalculatedWidth - roundedCalculatedWidth; accumulatedRoundError = rawCalculatedWidth - roundedCalculatedWidth;
} }
child.measure(MeasureSpec.makeMeasureSpec(roundedCalculatedWidth, MeasureSpec.EXACTLY),
MeasureSpec.makeMeasureSpec(child.getMeasuredHeight(), int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(roundedCalculatedWidth, MeasureSpec.EXACTLY);
MeasureSpec.EXACTLY));
// NOTE: for controls that support internal content wrapping (e.g. TextView) reducing the width
// might result in increased height e.g. text that could be shown on one line for larger
// width needs to be wrapped in two when width is reduced.
// As a result we cannot unconditionally measure with EXACTLY the current measured height
int childHeightMeasureSpec = getChildMeasureSpec(this.getMeasuredHeightAndState(),
getPaddingTop() + getPaddingBottom() + lp.topMargin
+ lp.bottomMargin, lp.height < 0 ? LayoutParams.WRAP_CONTENT : lp.height);
child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
// make sure crossSize is up-to-date as child calculated height might have increased
flexLine.mCrossSize = Math.max(
flexLine.mCrossSize,
child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin
);
} }
flexLine.mMainSize += child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin; flexLine.mMainSize += child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin;
} else { } else {

28
ios/TNSWidgets/TNSWidgets/TNSLabel.m
View File

@@ -12,13 +12,27 @@
- (CGRect)textRectForBounds:(CGRect)bounds limitedToNumberOfLines:(NSInteger)numberOfLines { - (CGRect)textRectForBounds:(CGRect)bounds limitedToNumberOfLines:(NSInteger)numberOfLines {
CGSize size = [super textRectForBounds:bounds limitedToNumberOfLines:numberOfLines].size; // UILabel.textRectForBounds:limitedToNumberOfLines: returns rect with CGSizeZero when empty
return CGRectMake( if (self.text.length == 0) {
- (self.borderThickness.left + self.padding.left), return [super textRectForBounds:bounds limitedToNumberOfLines:numberOfLines];
- (self.borderThickness.right + self.padding.right), }
size.width + self.borderThickness.left + self.padding.left + self.padding.right + self.borderThickness.right,
size.height + self.borderThickness.top + self.padding.top + self.padding.bottom + self.borderThickness.bottom // 1. Subtract the insets (border thickness & padding)
); // 2. Calculate the original label bounds
// 3. Add the insets again
UIEdgeInsets insets = UIEdgeInsetsMake(self.borderThickness.top + self.padding.top,
self.borderThickness.left + self.padding.left,
self.borderThickness.bottom + self.padding.bottom,
self.borderThickness.right + self.padding.right);
CGRect rect = [super textRectForBounds:UIEdgeInsetsInsetRect(bounds, insets) limitedToNumberOfLines:numberOfLines];
UIEdgeInsets inverseInsets = UIEdgeInsetsMake(-(self.borderThickness.top + self.padding.top),
-(self.borderThickness.left + self.padding.left),
-(self.borderThickness.bottom + self.padding.bottom),
-(self.borderThickness.right + self.padding.right));
return UIEdgeInsetsInsetRect(rect, inverseInsets);
} }
-(void)drawTextInRect:(CGRect)rect { -(void)drawTextInRect:(CGRect)rect {