letter spacing

NeptuneMC · Apr 7, 2024 · 4894742 · 4894742
1 parent 7618c4d
commit 4894742
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/main/kotlin/com/neptuneclient/voidui/themes/styles/TextStyleSheet.kt b/src/main/kotlin/com/neptuneclient/voidui/themes/styles/TextStyleSheet.kt
@@ -7,5 +7,6 @@ import java.nio.file.Path
 class TextStyleSheet(
     color: Color,
     val font: Path,
-    val size: Int
+    val size: Int,
+    val letterSpacing: Int = 0
 ) : StyleSheet(color)
diff --git a/src/main/kotlin/com/neptuneclient/voidui/utils/Font.kt b/src/main/kotlin/com/neptuneclient/voidui/utils/Font.kt
@@ -5,7 +5,7 @@ import java.io.IOException
 import java.nio.ByteBuffer
 import java.nio.file.Path
 
-class Font(void: VoidUI, val identifier: String, filePath: Path, val size: Int) {
+class Font(void: VoidUI, val identifier: String, filePath: Path, val size: Int, val letterSpacing: Int) {
 
     val data: ByteBuffer = try {
         getBufferData(filePath)

diff --git a/src/main/kotlin/com/neptuneclient/voidui/widgets/elements.kt b/src/main/kotlin/com/neptuneclient/voidui/widgets/elements.kt
@@ -64,7 +64,7 @@ abstract class AbstractText(private val label: String) : Element<TextStyleSheet>
 
     override fun init(screen: Screen, parent: Widget?) {
         super.init(screen, parent)
-        font = Font(screen.void, this.toString(), styles.font, styles.size)
+        font = Font(screen.void, this.toString(), styles.font, styles.size, styles.letterSpacing)
         screen.void.renderer.registerFont(font)
     }
 

diff --git a/src/test/kotlin/com/neptuneclient/voidui/tests/TestRenderer.kt b/src/test/kotlin/com/neptuneclient/voidui/tests/TestRenderer.kt
@@ -203,6 +203,7 @@ class TestRenderer : Renderer {
             NanoVG.nvgFillColor(vg, it)
             NanoVG.nvgFontFace(vg, font.identifier)
             NanoVG.nvgFontSize(vg, font.size.toFloat())
+            NanoVG.nvgTextLetterSpacing(vg, font.letterSpacing.toFloat())
 
             val bounds = BufferUtils.createFloatBuffer(4)
             NanoVG.nvgTextBounds(vg, x, y, text, bounds)
@@ -216,6 +217,7 @@ class TestRenderer : Renderer {
 
         NanoVG.nvgFontSize(vg, font.size.toFloat())
         NanoVG.nvgFontFace(vg, font.identifier)
+        NanoVG.nvgTextLetterSpacing(vg, font.letterSpacing.toFloat())
         NanoVG.nvgTextBounds(vg, 0f, 0f, text, buffer)
         return Size(buffer[2] - buffer[0], buffer[3] - buffer[1])
     }

diff --git a/src/test/kotlin/com/neptuneclient/voidui/tests/TestTheme.kt b/src/test/kotlin/com/neptuneclient/voidui/tests/TestTheme.kt
@@ -46,14 +46,16 @@ class TestTheme : Theme(
         normal = TextStyleSheet(
             color = Color.WHITE,
             font = Path.of("fonts/Jost-SemiBold.ttf"),
-            size = 32
+            size = 32,
+            letterSpacing = 12
         )
     ),
     smallTitle = Styles(
         normal = TextStyleSheet(
             color = Color.WHITE,
             font = Path.of("fonts/Jost-SemiBold.ttf"),
-            size = 22
+            size = 22,
+            letterSpacing = 8
         )
     ),
     heading = Styles(