diff --git a/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt b/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt index 4722fb2b..1e550d31 100644 --- a/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt +++ b/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt @@ -15,7 +15,7 @@ object Dep { const val group = "com.qmuiteam" const val qmuiVer = "2.1.0.2" const val archVer = "2.1.0.2" - const val typeVer = "0.1.0.3" + const val typeVer = "0.1.0.4" const val composeCoreVer = "0.0.1" const val composeVer = "0.0.1.2" const val photoVer = "0.0.1.7" diff --git a/type/src/main/java/com/qmuiteam/qmui/type/LineLayout.kt b/type/src/main/java/com/qmuiteam/qmui/type/LineLayout.kt index 5a454f5d..509d5b05 100644 --- a/type/src/main/java/com/qmuiteam/qmui/type/LineLayout.kt +++ b/type/src/main/java/com/qmuiteam/qmui/type/LineLayout.kt @@ -94,7 +94,7 @@ class LineLayout { line.add(element) line.layout(env, dropLastIfSpace, false) addLineAndHandleMaxLineAndNextY(line, true) - if (canInterrupt()) { + if (canInterrupt(element)) { handleEllipse(env,true) totalLineCount = mLines.size return @@ -111,7 +111,7 @@ class LineLayout { line.layout(env, dropLastIfSpace, false) addLineAndHandleMaxLineAndNextY(line, false) - if (canInterrupt()) { + if (canInterrupt(element)) { totalLineCount = mLines.size handleEllipse(env,true) return @@ -455,8 +455,11 @@ class LineLayout { } } - private fun canInterrupt(): Boolean { - return mLines.size == getUsedMaxLine() && !calculateWholeLines && (ellipsize == null || ellipsize == TruncateAt.END) + private fun canInterrupt(element: Element): Boolean { + return mLines.size == getUsedMaxLine() && + !calculateWholeLines && + (ellipsize == null || ellipsize == TruncateAt.END) && + element.next != null } private fun getUsedMaxLine(): Int {