Updated AutoChat

Author: cev-api

src/main/java/net/wurstclient/clickgui/SettingsWindow.java

@@ -17,6 +17,7 @@
 public final class SettingsWindow extends Window
 {
 	private final Feature feature;
+	private boolean rebuilding;
 
 	public SettingsWindow(Feature feature, Window parent, int buttonY)
 	{
@@ -34,14 +35,31 @@ public SettingsWindow(Feature feature, Window parent, int buttonY)
 
 	public void rebuild()
 	{
-		clearChildren();
+		if(rebuilding)
+			return;
 
-		Stream<Setting> settings = feature.getSettings().values().stream()
-			.filter(Setting::isVisibleInGui);
-		settings.map(Setting::getComponent).filter(Objects::nonNull)
-			.forEach(this::add);
+		rebuilding = true;
 
-		pack();
+		try
+		{
+			clearChildren();
+			
+			Stream<Setting> settings = feature.getSettings().values().stream()
+				.peek(Setting::update).filter(Setting::isVisibleInGui);
+			settings.map(Setting::getComponent).filter(Objects::nonNull)
+				.forEach(this::add);
+			
+			pack();
+			
+		}finally
+		{
+			rebuilding = false;
+		}
+	}
+	
+	public boolean isRebuilding()
+	{
+		return rebuilding;
 	}
 
 	private void setInitialPosition(Window parent, int buttonY)

src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java

@@ -44,7 +44,8 @@ public ComboBoxComponent(EnumSetting<T> setting)
 	public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
 		MouseButtonEvent context)
 	{
-		if(mouseX < getX() + getWidth() - popupWidth - getBoxHeight() - 4)
+		if(mouseX < getX() + getWidth() - getVisibleValueWidth()
+			- getBoxHeight() - 4)
 			return;
 
 		switch(mouseButton)
@@ -93,7 +94,8 @@ public void extractRenderState(GuiGraphicsExtractor context, int mouseX,
 		int x2 = x1 + getWidth();
 		int boxHeight = getBoxHeight();
 		int x3 = x2 - boxHeight;
-		int x4 = x3 - popupWidth - 4;
+		int valueWidth = getVisibleValueWidth();
+		int x4 = x3 - valueWidth - 4;
 		int y1 = getY();
 		int y2 = y1 + getHeight();
 
@@ -124,12 +126,27 @@ public void extractRenderState(GuiGraphicsExtractor context, int mouseX,
 
 		// text
 		String name = setting.getName();
-		String value = "" + setting.getSelected();
+		String value = trimToWidth("" + setting.getSelected(), valueWidth - 4);
 		int txtColor = GUI.getTxtColor();
 		context.text(TR, name, x1, y1 + 2, txtColor, false);
 		context.text(TR, value, x4 + 2, y1 + 2, txtColor, false);
 	}
 
+	private int getVisibleValueWidth()
+	{
+		int maxWidth = getWidth() - getBoxHeight() - 4;
+		return Math.max(24, Math.min(popupWidth, maxWidth));
+	}
+	
+	private static String trimToWidth(String text, int width)
+	{
+		if(TR.width(text) <= width)
+			return text;
+		
+		return TR.plainSubstrByWidth(text, Math.max(0, width - TR.width("...")))
+			+ "...";
+	}
+	
 	private int getFillColor(boolean hovering)
 	{
 		float opacity = GUI.getOpacity() * (hovering ? 1.5F : 1);