GUI scaling

Author: Avanatiker

src/main/kotlin/com/lambda/config/settings/numeric/IntegerSetting.kt

@@ -51,7 +51,7 @@ class IntegerSetting(
         sameLine()
         helpMarker(description)
 
-        inputInt("##$name", ::value)
+        slider("##$name", ::value, range.start, range.endInclusive, "%d$unit")
     }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {

src/main/kotlin/com/lambda/gui/DearImGui.kt

@@ -20,6 +20,7 @@ package com.lambda.gui
 import com.lambda.Lambda.mc
 import com.lambda.core.Loadable
 import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.module.modules.client.GuiSettings
 import com.lambda.util.path
 import com.mojang.blaze3d.opengl.GlStateManager
 import com.mojang.blaze3d.systems.RenderSystem
@@ -32,6 +33,7 @@ import net.minecraft.client.gl.GlBackend
 import net.minecraft.client.texture.GlTexture
 import org.lwjgl.opengl.GL11.glViewport
 import org.lwjgl.opengl.GL30.GL_FRAMEBUFFER
+import kotlin.math.abs
 
 object DearImGui : Loadable {
     val implGlfw = ImGuiImplGlfw()
@@ -42,8 +44,46 @@ object DearImGui : Loadable {
             ImGuiConfigFlags.NavEnableSetMousePos or // Move the cursor using the keyboard
             ImGuiConfigFlags.DockingEnable
 
+    private var lastScale = 0f
+    private var lastScaleChangeTimestamp = 0L
+    private var scaleChanged = false
+    private var targetScale = 0f
+
+    private fun updateScale(scale: Float) {
+        val scaleFactor = if (lastScale > 0) scale / lastScale else scale
+        ImGui.getStyle().scaleAllSizes(scaleFactor)
+
+        io.fonts.clear()
+        val baseFontSize = 13f
+        io.fonts.addFontFromFileTTF("fonts/FiraSans-Regular.ttf".path, baseFontSize * scale)
+        io.fonts.build()
+
+        implGl3.createFontsTexture()
+    }
+
     fun render(block: ImGuiBuilder.() -> Unit) {
-        // Minecraft will not bind the framebuffer unless it is needed, so do it manually and hope Vulcan never gets real:tm:
+        val scale = (GuiSettings.scaleSetting / 100.0).toFloat()
+
+        if (lastScale == 0f) {
+            targetScale = scale
+            updateScale(targetScale)
+            lastScale = targetScale
+        }
+
+        if (scale > 0 && abs(scale - lastScale) > 0.001f) {
+            if (abs(scale - targetScale) > 0.001f) {
+                lastScaleChangeTimestamp = System.currentTimeMillis()
+                scaleChanged = true
+                targetScale = scale
+            }
+        }
+
+        if (scaleChanged && (lastScaleChangeTimestamp + 1000 < System.currentTimeMillis())) {
+            updateScale(targetScale)
+            lastScale = targetScale
+            scaleChanged = false
+        }
+
         val framebuffer = mc.framebuffer
         val prevFramebuffer = (framebuffer.getColorAttachment() as GlTexture).getOrCreateFramebuffer((RenderSystem.getDevice() as GlBackend).framebufferManager, null)
 
@@ -73,11 +113,6 @@ object DearImGui : Loadable {
 
         io.configFlags = DEFAULT_FLAGS
         io.iniFilename = "lambda.ini"
-        (13..24).forEach { size ->
-            io.fonts.addFontFromFileTTF("fonts/FiraSans-Bold.ttf".path, size.toFloat())
-            io.fonts.addFontFromFileTTF("fonts/FiraSans-Regular.ttf".path, size.toFloat())
-        }
-        io.fonts.build()
 
         implGlfw.init(mc.window.handle, true)
         implGl3.init()

src/main/kotlin/com/lambda/module/modules/client/GuiSettings.kt

@@ -28,7 +28,7 @@ object GuiSettings : Module(
     tag = ModuleTag.CLIENT,
 ) {
     // General
-    private val scaleSetting by setting("Scale", 100, 50..300, 1, unit = "%").group(Group.General)
+    internal val scaleSetting by setting("Scale", 100, 50..300, 1, unit = "%").group(Group.General)
 
     // Colors
     val primaryColor by setting("Primary Color", Color(130, 200, 255)).group(Group.Colors)