You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/23 11:00:43 UTC
[1/3] incubator-weex git commit: apply style spans to ellipsis,
and keep new static layout params same with create layout when
truncate
Repository: incubator-weex
Updated Branches:
refs/heads/release-0.16 10832b11f -> ee83fd3f9
apply style spans to ellipsis, and keep new static layout params same with create layout when truncate
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4b5b256a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4b5b256a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4b5b256a
Branch: refs/heads/release-0.16
Commit: 4b5b256a1349836640558565884d1a3c6f792add
Parents: 4d8a51f
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Oct 23 17:56:51 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Oct 23 17:56:51 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/dom/WXTextDomObject.java | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4b5b256a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
index e9a5c79..6cfe983 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
@@ -334,9 +334,14 @@ public class WXTextDomObject extends WXDomObject {
lastLineStart = layout.getLineStart(mNumberOfLines - 1);
lastLineEnd = layout.getLineEnd(mNumberOfLines - 1);
if (lastLineStart < lastLineEnd) {
- SpannableStringBuilder builder = new SpannableStringBuilder(spanned.subSequence(0, lastLineStart));
+ SpannableStringBuilder builder = null;
+ if(lastLineStart > 0) {
+ builder = new SpannableStringBuilder(spanned.subSequence(0, lastLineStart));
+ }else{
+ builder = new SpannableStringBuilder();
+ }
Editable lastLine = new SpannableStringBuilder(spanned.subSequence(lastLineStart, lastLineEnd));
- builder.append(truncate(lastLine, mTextPaint, layout.getWidth(), textOverflow));
+ builder.append(truncate(lastLine, mTextPaint, (int) Math.ceil(textWidth), textOverflow));
adjustSpansRange(spanned, builder);
spanned = builder;
return new StaticLayout(spanned, mTextPaint, (int) Math.ceil(textWidth),
@@ -364,6 +369,15 @@ public class WXTextDomObject extends WXDomObject {
if (!TextUtils.isEmpty(source) && source.length() > 0) {
if (truncateAt != null) {
source.append(ELLIPSIS);
+ Object[] spans = source.getSpans(0, source.length(), Object.class);
+ for(Object span:spans){
+ int start = source.getSpanStart(span);
+ int end = source.getSpanEnd(span);
+ if(start == 0 && end == source.length()-1){
+ source.removeSpan(span);
+ source.setSpan(span, 0, source.length(), source.getSpanFlags(span));
+ }
+ }
}
StaticLayout layout;
@@ -375,7 +389,7 @@ public class WXTextDomObject extends WXDomObject {
startOffset -= 1;
}
source.delete(startOffset, startOffset+1);
- layout = new StaticLayout(source, paint, desired, Layout.Alignment.ALIGN_NORMAL, 1, 0, true);
+ layout = new StaticLayout(source, paint, desired, Layout.Alignment.ALIGN_NORMAL, 1, 0, false);
if (layout.getLineCount() <= 1) {
ret = source;
break;
[2/3] incubator-weex git commit: Merge branch 'release-0.16' of
https://github.com/apache/incubator-weex into release-0.16
Posted by gu...@apache.org.
Merge branch 'release-0.16' of https://github.com/apache/incubator-weex into release-0.16
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ae011d36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ae011d36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ae011d36
Branch: refs/heads/release-0.16
Commit: ae011d36fe413d1be31eb41c4147513266774d13
Parents: 4b5b256 d696586
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Oct 23 17:58:52 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Oct 23 17:58:52 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/common/Constants.java | 1 +
.../taobao/weex/ui/component/WXComponent.java | 17 +++-
.../com/taobao/weex/utils/BoxShadowUtil.java | 88 ++++++++++++-------
dangerfile.js | 2 +
test/screenshot/border-android.png | Bin 164260 -> 164417 bytes
5 files changed, 77 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-weex git commit: * [android] apply style span to
ellipsis when truncate, measure text line count right
Posted by gu...@apache.org.
* [android] apply style span to ellipsis when truncate, measure text line count right
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ee83fd3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ee83fd3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ee83fd3f
Branch: refs/heads/release-0.16
Commit: ee83fd3f9cf8373d1077318d741c6e2bb3717d53
Parents: 10832b1 ae011d3
Author: gurisxie <27...@qq.com>
Authored: Mon Oct 23 19:00:06 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Mon Oct 23 19:00:35 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/dom/WXTextDomObject.java | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------