Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

* [ios] support max-width when drawing text #834

Merged
merged 7 commits into from
Nov 9, 2017
Merged

* [ios] support max-width when drawing text #834

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81115d0
* [ios] fix issue https://issues.apache.org/jira/browse/WEEX-81 that…
acton393 Oct 13, 2017
fba9dfe
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…
acton393 Oct 16, 2017
0e1470a
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…
acton393 Oct 18, 2017
343ad6f
* [ios] parse fetch response while the callback is existed
acton393 Oct 18, 2017
6cd64a7
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…
acton393 Oct 26, 2017
e1f3344
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…
acton393 Oct 31, 2017
5896a61
* [ios] fix issue https://issues.apache.org/jira/projects/WEEX/issues…
acton393 Nov 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,16 @@ - (UIImage *)drawRect:(CGRect)rect;
return ^CGSize (CGSize constrainedSize) {
CGSize computedSize = CGSizeZero;
NSTextStorage *textStorage = nil;

//TODO:more elegant way to use max and min constrained size
if (!isnan(weakSelf.cssNode->style.minDimensions[CSS_WIDTH])) {
constrainedSize.width = MAX(constrainedSize.width, weakSelf.cssNode->style.minDimensions[CSS_WIDTH]);
}

if (!isnan(weakSelf.cssNode->style.maxDimensions[CSS_WIDTH])) {
constrainedSize.width = MIN(constrainedSize.width, weakSelf.cssNode->style.maxDimensions[CSS_WIDTH]);
}

if (![self useCoreText]) {
textStorage = [weakSelf textStorageWithWidth:constrainedSize.width];
NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
Expand All @@ -325,15 +335,6 @@ - (UIImage *)drawRect:(CGRect)rect;
} else {
computedSize = [weakSelf calculateTextHeightWithWidth:constrainedSize.width];
}

//TODO:more elegant way to use max and min constrained size
if (!isnan(weakSelf.cssNode->style.minDimensions[CSS_WIDTH])) {
computedSize.width = MAX(computedSize.width, weakSelf.cssNode->style.minDimensions[CSS_WIDTH]);
}

if (!isnan(weakSelf.cssNode->style.maxDimensions[CSS_WIDTH])) {
computedSize.width = MIN(computedSize.width, weakSelf.cssNode->style.maxDimensions[CSS_WIDTH]);
}

if (!isnan(weakSelf.cssNode->style.minDimensions[CSS_HEIGHT])) {
computedSize.height = MAX(computedSize.height, weakSelf.cssNode->style.minDimensions[CSS_HEIGHT]);
Expand Down