未验证 提交 e28453bc 编写于 作者: E Enrico D'Ortenzio 提交者: GitHub

Custom fonts: Fix title being cut off, resolves #1936 (#1944)

上级 43d9a581
...@@ -29,6 +29,7 @@ import androidx.annotation.RestrictTo ...@@ -29,6 +29,7 @@ import androidx.annotation.RestrictTo
import androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP import androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP
import com.afollestad.materialdialogs.R import com.afollestad.materialdialogs.R
import com.afollestad.materialdialogs.utils.MDUtil.dimenPx import com.afollestad.materialdialogs.utils.MDUtil.dimenPx
import com.afollestad.materialdialogs.utils.MDUtil.maybeSetAdditionalPadding
import com.afollestad.materialdialogs.utils.isNotVisible import com.afollestad.materialdialogs.utils.isNotVisible
import com.afollestad.materialdialogs.utils.isRtl import com.afollestad.materialdialogs.utils.isRtl
import com.afollestad.materialdialogs.utils.isVisible import com.afollestad.materialdialogs.utils.isVisible
...@@ -114,6 +115,7 @@ class DialogTitleLayout( ...@@ -114,6 +115,7 @@ class DialogTitleLayout(
val titleHalfHeight = titleView.measuredHeight / 2 val titleHalfHeight = titleView.measuredHeight / 2
val titleTop = contentMidPoint - titleHalfHeight val titleTop = contentMidPoint - titleHalfHeight
val titleBottom = contentMidPoint + titleHalfHeight val titleBottom = contentMidPoint + titleHalfHeight
+ titleView.maybeSetAdditionalPadding(titleView.measuredHeight)
var titleLeft: Int var titleLeft: Int
var titleRight: Int var titleRight: Int
......
...@@ -234,6 +234,12 @@ object MDUtil { ...@@ -234,6 +234,12 @@ object MDUtil {
} }
} }
@RestrictTo(LIBRARY_GROUP) fun TextView.maybeSetAdditionalPadding(height: Int): Int {
val fm = paint.fontMetrics
val textHeight = fm.descent - fm.ascent
return if (textHeight > height) (textHeight - height).toInt() else 0
}
@RestrictTo(LIBRARY_GROUP) inline fun Int?.ifNotZero(block: (value: Int) -> Unit) { @RestrictTo(LIBRARY_GROUP) inline fun Int?.ifNotZero(block: (value: Int) -> Unit) {
if (this != null && this != 0) { if (this != null && this != 0) {
block(this) block(this)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册