From 650251f5046bfe2a2555fd53c1b63d5c8f9308bb Mon Sep 17 00:00:00 2001
From: logarithm <allan.palmu@gmail.com>
Date: Thu, 28 Nov 2019 16:58:14 +0200
Subject: [PATCH] skybox: improve target color selection UX

---
 .../client/plugins/skybox/SkyboxPlugin.java   |  1 +
 .../plugins/skybox/SkyboxPluginConfig.java    | 32 +++++++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java
index b282eb7013..b56fded87e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java
@@ -92,6 +92,7 @@ public class SkyboxPlugin extends Plugin
 				config.setColorToOverride(c);
 			}
 			config.setOverrideMode(SkyOverrideMode.ONE);
+			config.setPickColorToOverride(false);
 		}
 
 		skybox.setOverrideColors(config.colorToOverride().getRGB(), config.customColor().getRGB());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPluginConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPluginConfig.java
index 408abb1acb..01f6694238 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPluginConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPluginConfig.java
@@ -38,7 +38,10 @@ public interface SkyboxPluginConfig extends Config
 		description = "Set a color here to use it with the options below",
 		position = 1
 	)
-	default Color customColor() { return Color.BLACK; }
+	default Color customColor()
+	{
+		return Color.BLACK;
+	}
 
 	@ConfigItem(
 		keyName = "skyOverrideMode",
@@ -50,31 +53,40 @@ public interface SkyboxPluginConfig extends Config
 	{
 		return SkyOverrideMode.NONE;
 	}
+	@ConfigItem(
+		keyName = "skyOverrideMode", name = "", description = ""
+	)
 	void setOverrideMode(SkyOverrideMode value);
 
 	@ConfigItem(
 		keyName = "pickColorToOverride",
 		name = "Set current sky as target",
 		description = "Sets target color to current chunk's sky color when switched on",
+		warning = "Are you sure that you want to set the target color to the current sky color and forget the previous one?",
 		position = 3
 	)
-	default boolean pickColorToOverride() { return false; }
+	default boolean pickColorToOverride()
+	{
+		return false;
+	}
+	@ConfigItem(
+		keyName = "pickColorToOverride", name = "", description = ""
+	)
+	void setPickColorToOverride(boolean value);
 
 	@ConfigItem(
 		keyName = "colorToOverride",
 		name = "Target color",
 		description = "Changing this manually is not recommended, but copying the value for tweaking is useful. Note that the value will not update when you enable the picker, until you re-enter the config panel.",
-		hidden = false,
+		hidden = true,
 		position = 4
 	)
-	default Color colorToOverride() { return Color.BLACK; }
-
+	default Color colorToOverride()
+	{
+		return Color.BLACK;
+	}
 	@ConfigItem(
-		keyName = "colorToOverride",
-		name = "Target color",
-		description = "Changing this manually is not recommended, but copying the value for tweaking is useful. Note that the value will not update when you enable the picker, until you re-enter the config panel.",
-		hidden = false,
-		position = 4
+		keyName = "colorToOverride", name = "", description = ""
 	)
 	void setColorToOverride(Color value);
 }