From d750339c07c53c4cf97d04e7c09136d5d9db348d Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Thu, 27 Jun 2019 19:32:35 -0400 Subject: [PATCH] Fix crash in EnumButtonTests due to attempted TextRenderer usage --- src/main/kotlin/net/shadowfacts/cacao/view/Label.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/net/shadowfacts/cacao/view/Label.kt b/src/main/kotlin/net/shadowfacts/cacao/view/Label.kt index 77fbf82..e9e879c 100644 --- a/src/main/kotlin/net/shadowfacts/cacao/view/Label.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/view/Label.kt @@ -6,7 +6,6 @@ import net.shadowfacts.cacao.geometry.Point import net.shadowfacts.cacao.geometry.Size import net.shadowfacts.cacao.util.Color import net.shadowfacts.cacao.util.RenderHelper -import kotlin.math.roundToInt /** * A simple View that displays text. Allows for controlling the color and shadow of the text. Label cannot be used @@ -94,8 +93,7 @@ class Label( var lines = text.split("\n") if (wrappingMode == WrappingMode.WRAP) { lines = lines.flatMap { - val maxWidth = bounds.width.toInt() - textRenderer.wrapStringToWidthAsList(it, maxWidth) + wrapStringToWidthAsList(it, bounds.width) } } if (0 < maxLines && maxLines < lines.size) { @@ -104,4 +102,9 @@ class Label( this.lines = lines } + private fun wrapStringToWidthAsList(string: String, width: Double): List { + if (RenderHelper.disabled) return listOf(string) + return textRenderer.wrapStringToWidthAsList(string, width.toInt()) + } + } \ No newline at end of file