Make WWidget.setHost apply to children and null-safe

CottonMC · Aug 16, 2022 · 85e6c34 · 85e6c34
1 parent 7122942
commit 85e6c34
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java
@@ -7,7 +7,6 @@
 import io.github.cottonmc.cotton.gui.GuiDescription;
 import io.github.cottonmc.cotton.gui.widget.data.Axis;
 import io.github.cottonmc.cotton.gui.widget.data.InputResult;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -124,9 +123,9 @@ public void validate(GuiDescription c) {
 	}
 
 	@Override
-	public void setHost(@Nullable GuiDescription host) {
+	public void setHost(GuiDescription host) {
 		super.setHost(host);
-		if (host != null) setRequiredHosts(host);
+		setRequiredHosts(host);
 	}
 
 	private void setRequiredHosts(GuiDescription host) {

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WPanel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WPanel.java
@@ -130,6 +130,14 @@ public void validate(GuiDescription c) {
 		}
 	}
 
+	@Override
+	public void setHost(GuiDescription host) {
+		super.setHost(host);
+		for (WWidget child : children) {
+			child.setHost(host);
+		}
+	}
+
 	@Environment(EnvType.CLIENT)
 	@Override
 	public void paint(MatrixStack matrices, int x, int y, int mouseX, int mouseY) {

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WWidget.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WWidget.java
@@ -386,14 +386,18 @@ public final GuiDescription getHost() {
 	}
 
 	/**
-	 * Sets the host of this widget without creating peers.
+	 * Sets the host of this widget and all its children without creating peers.
 	 *
 	 * @param host the new host
 	 * @see #host
 	 * @since 2.1.0
 	 */
-	public void setHost(@Nullable GuiDescription host) {
-		this.host = host;
+	public void setHost(GuiDescription host) {
+		if (host != null) {
+			this.host = host;
+		} else {
+			LOGGER.warn("Setting null host for {}", this);
+		}
 	}
 
 	/**