Skip to content

解决特殊情况下的bug #8

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

Open
ZzoeyYang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

解决特殊情况下的bug #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5673d0
处理遇到因为英文字符导致末尾的给展开预留的位置不够而导致换行
yangqian-iri Sep 20, 2018
1f05a9a
还原默认设置，同时解决不要收起功能
yangqian-iri Sep 20, 2018
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
5 changes: 4 additions & 1 deletion library/src/main/java/com/zly/widget/CollapsedTextView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public void setExpandedText(String expandedText) {
* @param collapsedText 提示文本
*/
public void setCollapsedText(String collapsedText) {
this.mCollapsedText = TextUtils.isEmpty(collapsedText) ? COLLAPSED_TEXT : collapsedText;
this.mCollapsedText = collapsedText == null ? COLLAPSED_TEXT : collapsedText;
}

/**
Expand Down Expand Up @@ -329,6 +329,9 @@ private void formatCollapsedText(BufferType type, CharSequence text) {
// 如果大于屏幕宽度则需要减去部分字符
if (lastLineWidth + expandedTextWidth > mShowWidth) {
int cutCount = paint.breakText(mOriginalText, lastLineStart, lastLineEnd, false, expandedTextWidth, null);
while (paint.measureText(mOriginalText.subSequence(lastLineStart, lastLineEnd - cutCount) + ELLIPSE + " " + mExpandedText) > mShowWidth) {
cutCount++;
}
lastLineEnd -= cutCount;
}
// 因设置的文本可能是带有样式的文本，如SpannableStringBuilder，所以根据计算的字符数从原始文本中截取
Expand Down