From dd65110f60aa3e32c2970863a06a7682520cce5e Mon Sep 17 00:00:00 2001
From: Xander <xander@isxander.dev>
Date: Sun, 11 Dec 2022 19:31:56 +0000
Subject: [Feature] Lists (#40)

---
 .../yacl/gui/controllers/string/StringControllerElement.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/client/java/dev/isxander/yacl/gui/controllers/string')

diff --git a/src/client/java/dev/isxander/yacl/gui/controllers/string/StringControllerElement.java b/src/client/java/dev/isxander/yacl/gui/controllers/string/StringControllerElement.java
index ef70341..da33aec 100644
--- a/src/client/java/dev/isxander/yacl/gui/controllers/string/StringControllerElement.java
+++ b/src/client/java/dev/isxander/yacl/gui/controllers/string/StringControllerElement.java
@@ -49,7 +49,7 @@ public class StringControllerElement extends ControllerWidget<IStringController<
     @Override
     protected void drawValueText(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         Text valueText = getValueText();
-        if (!isHovered()) valueText = Text.literal(GuiUtils.shortenString(valueText.getString(), textRenderer, getDimension().width() / 2, "...")).setStyle(valueText.getStyle());
+        if (!isHovered()) valueText = Text.literal(GuiUtils.shortenString(valueText.getString(), textRenderer, getMaxUnwrapLength(), "...")).setStyle(valueText.getStyle());
 
         matrices.push();
         int textX = getDimension().xLimit() - textRenderer.getWidth(valueText) + renderOffset - getXPadding();
@@ -311,9 +311,17 @@ public class StringControllerElement extends ControllerWidget<IStringController<
     }
 
     public int getUnshiftedLength() {
+        if (optionNameString.isEmpty())
+            return getDimension().width() - getXPadding() * 2;
         return getDimension().width() / 8 * 5;
     }
 
+    public int getMaxUnwrapLength() {
+        if (optionNameString.isEmpty())
+            return getDimension().width() - getXPadding() * 2;
+        return getDimension().width() / 2;
+    }
+
     public int getSelectionStart() {
         return Math.min(caretPos, caretPos + selectionLength);
     }
@@ -378,7 +386,7 @@ public class StringControllerElement extends ControllerWidget<IStringController<
 
     @Override
     protected int getUnhoveredControlWidth() {
-        return !isHovered() ? Math.min(getHoveredControlWidth(), getDimension().width() / 2) : getHoveredControlWidth();
+        return !isHovered() ? Math.min(getHoveredControlWidth(), getMaxUnwrapLength()) : getHoveredControlWidth();
     }
 
     @Override
-- 
cgit