fix rich tooltip scale & alignment

Author: brachy84

src/main/java/com/cleanroommc/modularui/api/drawable/IRichTextBuilder.java

@@ -19,6 +19,11 @@ default T add(IDrawable drawable) {
         return getThis();
     }
 
+    default T addLine(String s) {
+        getRichText().add(s).newLine();
+        return getThis();
+    }
+
     default T addLine(ITextLine line) {
         getRichText().addLine(line);
         return getThis();

src/main/java/com/cleanroommc/modularui/drawable/text/TextRenderer.java

@@ -127,12 +127,14 @@ public void drawCompiled(GuiContext context, List<ITextLine> lines) {
         }
         if (!this.simulate) {
             GlStateManager.pushMatrix();
+            GlStateManager.translate(this.x, this.y, 10);
             GlStateManager.scale(this.scale, this.scale, 1f);
+            GlStateManager.translate(-this.x, -this.y, 0);
         }
-        int y0 = getStartY(height * this.scale);
+        int y0 = getStartY(height, height);
         this.lastY = y0;
         for (ITextLine line : lines) {
-            int x0 = getStartX(line.getWidth() * this.scale);
+            int x0 = getStartX(width, line.getWidth());
             if (!simulate) line.draw(context, getFontRenderer(), x0, y0, this.color, this.shadow);
             y0 += line.getHeight(getFontRenderer());
         }
@@ -209,15 +211,23 @@ protected int getStartYOfLines(int lines) {
     }
 
     protected int getStartY(float height) {
-        if (this.alignment.y > 0 && this.maxHeight > 0) {
-            return (int) (this.y + (this.maxHeight * this.alignment.y) - height * this.alignment.y);
+        return getStartY(this.maxHeight, height);
+    }
+
+    protected int getStartY(float maxHeight, float height) {
+        if (this.alignment.y > 0 && maxHeight > 0 && height != maxHeight) {
+            return (int) (this.y + (maxHeight * this.alignment.y) - height * this.alignment.y);
         }
         return this.y;
     }
 
     protected int getStartX(float lineWidth) {
-        if (this.alignment.x > 0 && this.maxWidth > 0) {
-            return (int) (this.x + (this.maxWidth * this.alignment.x) - lineWidth * this.alignment.x);
+        return getStartX(this.maxWidth, lineWidth);
+    }
+
+    protected int getStartX(float maxWidth, float lineWidth) {
+        if (this.alignment.x > 0 && maxWidth > 0) {
+            return (int) (this.x + (maxWidth * this.alignment.x) - lineWidth * this.alignment.x);
         }
         return this.x;
     }

src/main/java/com/cleanroommc/modularui/test/TestGuis.java

@@ -6,7 +6,9 @@
 import com.cleanroommc.modularui.drawable.SpriteDrawable;
 import com.cleanroommc.modularui.screen.CustomModularScreen;
 import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
+import com.cleanroommc.modularui.utils.Alignment;
 import com.cleanroommc.modularui.utils.GameObjectHelper;
 import com.cleanroommc.modularui.utils.SpriteHelper;
 import com.cleanroommc.modularui.utils.fakeworld.ArraySchema;
@@ -33,7 +35,7 @@ public class TestGuis extends CustomModularScreen {
 
     @Override
     public @NotNull ModularPanel buildUI(ModularGuiContext context) {
-        return buildRichTextUI(context);
+        return buildSpriteUI(context);
     }
 
     public @NotNull ModularPanel buildSpriteUI(ModularGuiContext context) {
@@ -44,7 +46,15 @@ public class TestGuis extends CustomModularScreen {
                 .child(new DraggableWidget<>()
                         .background(new SpriteDrawable(sprite))
                         .size(20)
-                        .center());
+                        .center()
+                        .tooltipBuilder(tooltip -> {
+                            tooltip.addLine("Line 1");
+                            tooltip.addLine("Longer Line 2");
+                            tooltip.addLine("Line 3");
+                            tooltip.alignment(Alignment.Center);
+                            tooltip.scale(0.5f);
+                            tooltip.pos(RichTooltip.Pos.NEXT_TO_MOUSE);
+                        }));
     }