From f0c8020eaab7fbb8839365fc7e579985d442c0db Mon Sep 17 00:00:00 2001
From: Juuxel <kasperi.kauppi@gmail.com>
Date: Sat, 27 Jul 2019 22:18:22 +0300
Subject: Add support for disabling buttons

---
 .../github/cottonmc/cotton/gui/widget/WButton.java | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
index bfae32f..532dffb 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
@@ -11,6 +11,7 @@ public class WButton extends WWidget {
 	private Text label;
 	protected int color = WLabel.DEFAULT_TEXT_COLOR;
 	protected int darkmodeColor = WLabel.DEFAULT_TEXT_COLOR;
+	private boolean active = true;
 	
 	private Runnable onClick;
 	
@@ -32,7 +33,8 @@ public class WButton extends WWidget {
 	public void paintForeground(int x, int y, int mouseX, int mouseY) {
 		boolean hovered = (mouseX>=x && mouseY>=y && mouseX<x+getWidth() && mouseY<y+getHeight());
 		int int_3 = 1; //1=regular. 2=hovered. 0=disabled.
-		if (hovered) int_3 = 2;
+		if (!active) int_3 = 0;
+		else if (hovered) int_3 = 2;
 		
 		float px = 1/256f;
 		float buttonLeft = 0 * px;
@@ -48,12 +50,11 @@ public class WButton extends WWidget {
 		ScreenDrawing.rect(AbstractButtonWidget.WIDGETS_LOCATION, x+(getWidth()/2), y, getWidth()/2, 20, buttonEndLeft, buttonTop, 200*px, buttonTop+buttonHeight, 0xFFFFFFFF);
 		
 		if (label!=null) {
-			boolean active = true;
-			int color = 14737632;
+			int color = 0xE0E0E0;
 			if (!active) {
-				color = 10526880;
+				color = 0xA0A0A0;
 			} else if (hovered) {
-				color = 16777120;
+				color = 0xFFFFA0;
 			}
 			
 			ScreenDrawing.drawCenteredWithShadow(label.asFormattedString(), x+(getWidth()/2), y + ((20 - 8) / 2), color); //LibGuiClient.config.darkMode ? darkmodeColor : color);
@@ -68,12 +69,22 @@ public class WButton extends WWidget {
 	public void onClick(int x, int y, int button) {
 		super.onClick(x, y, button);
 		
-		MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
-		
-		if (onClick!=null) onClick.run();
+		if (active) {
+			MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
+
+			if (onClick!=null) onClick.run();
+		}
 	}
 
 	public void setOnClick(Runnable r) {
 		this.onClick = r;
 	}
+
+	public boolean isActive() {
+		return active;
+	}
+
+	public void setActive(boolean active) {
+		this.active = active;
+	}
 }
-- 
cgit 


From f4452bce5b7f3b96490a21e2c67f566e41ff99c2 Mon Sep 17 00:00:00 2001
From: Juuxel <kasperi.kauppi@gmail.com>
Date: Sat, 27 Jul 2019 22:24:52 +0300
Subject: int_3 => state

---
 src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
index 532dffb..876da0c 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
@@ -32,13 +32,13 @@ public class WButton extends WWidget {
 	@Override
 	public void paintForeground(int x, int y, int mouseX, int mouseY) {
 		boolean hovered = (mouseX>=x && mouseY>=y && mouseX<x+getWidth() && mouseY<y+getHeight());
-		int int_3 = 1; //1=regular. 2=hovered. 0=disabled.
-		if (!active) int_3 = 0;
-		else if (hovered) int_3 = 2;
+		int state = 1; //1=regular. 2=hovered. 0=disabled.
+		if (!active) state = 0;
+		else if (hovered) state = 2;
 		
 		float px = 1/256f;
 		float buttonLeft = 0 * px;
-		float buttonTop = (46 + (int_3*20)) * px;
+		float buttonTop = (46 + (state*20)) * px;
 		int halfWidth = getWidth()/2;
 		if (halfWidth>198) halfWidth=198;
 		float buttonWidth = halfWidth*px;
-- 
cgit 


From c560951ff9a6e44c9f95c489180c8599eaf560b5 Mon Sep 17 00:00:00 2001
From: Juuxel <kasperi.kauppi@gmail.com>
Date: Sun, 28 Jul 2019 09:25:02 +0300
Subject: active => enabled

---
 .../io/github/cottonmc/cotton/gui/widget/WButton.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
index 876da0c..3b6c299 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WButton.java
@@ -11,7 +11,7 @@ public class WButton extends WWidget {
 	private Text label;
 	protected int color = WLabel.DEFAULT_TEXT_COLOR;
 	protected int darkmodeColor = WLabel.DEFAULT_TEXT_COLOR;
-	private boolean active = true;
+	private boolean enabled = true;
 	
 	private Runnable onClick;
 	
@@ -33,7 +33,7 @@ public class WButton extends WWidget {
 	public void paintForeground(int x, int y, int mouseX, int mouseY) {
 		boolean hovered = (mouseX>=x && mouseY>=y && mouseX<x+getWidth() && mouseY<y+getHeight());
 		int state = 1; //1=regular. 2=hovered. 0=disabled.
-		if (!active) state = 0;
+		if (!enabled) state = 0;
 		else if (hovered) state = 2;
 		
 		float px = 1/256f;
@@ -51,7 +51,7 @@ public class WButton extends WWidget {
 		
 		if (label!=null) {
 			int color = 0xE0E0E0;
-			if (!active) {
+			if (!enabled) {
 				color = 0xA0A0A0;
 			} else if (hovered) {
 				color = 0xFFFFA0;
@@ -69,7 +69,7 @@ public class WButton extends WWidget {
 	public void onClick(int x, int y, int button) {
 		super.onClick(x, y, button);
 		
-		if (active) {
+		if (enabled) {
 			MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
 
 			if (onClick!=null) onClick.run();
@@ -80,11 +80,11 @@ public class WButton extends WWidget {
 		this.onClick = r;
 	}
 
-	public boolean isActive() {
-		return active;
+	public boolean isEnabled() {
+		return enabled;
 	}
 
-	public void setActive(boolean active) {
-		this.active = active;
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
 	}
 }
-- 
cgit