AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 19:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

text renderer: fix text in line when line cut off

Browse Source
This commit is contained in:
Bixilon 2022-02-18 21:49:55 +01:00
parent 870a691c7e
commit f9536f7f32
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/TextComponentRenderer.kt
View File

@ -48,11 +48,15 @@ object TextComponentRenderer : ChatComponentRenderer<TextComponent> {
return true return true
} }
fun pushLine() { fun pushLine(index: Int = -1) {
if (consumer != null || currentLineText.isEmpty()) { var pushText: String = currentLineText
if (index > 0) {
pushText = currentLineText.substring(0, index)
}
if (consumer != null || pushText.isEmpty()) {
return return
} }
renderInfo.currentLine.text += text.copy(message = currentLineText) renderInfo.currentLine.text += text.copy(message = pushText)
currentLineText = "" currentLineText = ""
} }
@ -124,11 +128,11 @@ object TextComponentRenderer : ChatComponentRenderer<TextComponent> {
} }
applyOffset() applyOffset()
for ((index, charCode) in text.message.codePoints().toArray().withIndex()) {
for (charCode in text.message.codePoints().toArray()) {
val char = charCode.toChar() val char = charCode.toChar()
if (char == '\n') { if (char == '\n') {
if (wrap()) { if (wrap()) {
pushLine(index)
return true return true
} }
continue continue
@ -157,6 +161,7 @@ object TextComponentRenderer : ChatComponentRenderer<TextComponent> {
val previousY = offset.y val previousY = offset.y
if (addX(width)) { if (addX(width)) {
pushLine(index)
return true return true
} }

7
src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElement.kt
View File

@ -219,9 +219,14 @@ open class TextElement(
textElement._prefMaxSize = Vec2i(offset.x, charHeight) textElement._prefMaxSize = Vec2i(offset.x, charHeight)
textElement.forceSilentApply() textElement.forceSilentApply()
offset.x += fontAlignment.getOffset(size.x, line.width) offset.x += fontAlignment.getOffset(size.x, line.width)
return Pair(line.text.getTextAt(textElement.renderInfo.lines.getOrNull(0)?.text?.message?.length ?: return null), offset) val line0 = textElement.renderInfo.lines.getOrNull(0) ?: return null
val text = line.text.getTextAt(line0.text.message.length)
offset.x -= line0.width // ToDo: Not 100% correct
return Pair(text, offset)
} }
override fun toString(): String { override fun toString(): String {