From 000239a778d1984a4ebe46482c85c8801ce78bf5 Mon Sep 17 00:00:00 2001
From: John Lewin <lewin76@gmail.com>
Date: Wed, 3 Oct 2018 21:26:41 -0700
Subject: [PATCH] Add HoverIconButton for two state hover effects

---
 .../CustomWidgets/SimpleButton.cs             | 84 ++++++++++++++-----
 .../ApplicationSettingsPage.cs                |  8 +-
 Submodules/agg-sharp                          |  2 +-
 3 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/MatterControlLib/CustomWidgets/SimpleButton.cs b/MatterControlLib/CustomWidgets/SimpleButton.cs
index 68d691f78..9d586f324 100644
--- a/MatterControlLib/CustomWidgets/SimpleButton.cs
+++ b/MatterControlLib/CustomWidgets/SimpleButton.cs
@@ -189,29 +189,12 @@ namespace MatterHackers.MatterControl.CustomWidgets
 
 	public class IconButton : SimpleButton
 	{
-		private ImageWidget imageWidget;
-		private ImageBuffer image;
+		protected ImageWidget imageWidget;
+		protected ImageBuffer image;
 
-		public IconButton(ImageBuffer icon, ImageBuffer hoverIcon, ThemeConfig theme)
+		public IconButton(ThemeConfig theme)
 			: base(theme)
 		{
-			this.image = icon;
-			this.HAnchor = HAnchor.Absolute;
-			this.VAnchor = VAnchor.Absolute | VAnchor.Center;
-			this.Height = theme.ButtonHeight;
-			this.Width = theme.ButtonHeight;
-
-			imageWidget = new HoverImageWidget(icon, hoverIcon)
-			{
-				HAnchor = HAnchor.Center,
-				VAnchor = VAnchor.Center,
-			};
-			imageWidget.Click += (s, e) =>
-			{
-				this.OnClick(e);
-			};
-
-			this.AddChild(imageWidget);
 		}
 
 		public IconButton(ImageBuffer icon, ThemeConfig theme)
@@ -241,7 +224,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
 		/// <param name="icon"></param>
 		internal void SetIcon(ImageBuffer icon)
 		{
-			image  = icon;
+			image = icon;
 			imageWidget.Image = icon;
 		}
 
@@ -495,4 +478,63 @@ namespace MatterHackers.MatterControl.CustomWidgets
 
 		public override string Text { get => textWidget.Text; set => textWidget.Text = value; }
 	}
+
+	public class HoverIconButton : IconButton
+	{
+		private ImageBuffer normalImage;
+		private ImageBuffer hoverImage;
+
+		// Single ImageBuffer constructor creates a grayscale copy for use as the normal image
+		// and uses the original as the hover image
+		public HoverIconButton(ImageBuffer icon, ThemeConfig theme)
+			: this(MakeGrayscale(icon), icon, theme)
+		{
+		}
+
+		public HoverIconButton(ImageBuffer icon, ImageBuffer hoverIcon, ThemeConfig theme)
+			: base(theme)
+		{
+			this.image = icon;
+
+			normalImage = icon;
+			hoverImage = hoverIcon;
+
+			this.HAnchor = HAnchor.Absolute;
+			this.VAnchor = VAnchor.Absolute | VAnchor.Center;
+			this.Height = theme.ButtonHeight;
+			this.Width = theme.ButtonHeight;
+
+			imageWidget = new ImageWidget(icon, listenForImageChanged: false)
+			{
+				HAnchor = HAnchor.Center,
+				VAnchor = VAnchor.Center,
+			};
+
+			this.AddChild(imageWidget);
+		}
+
+		public static ImageBuffer MakeGrayscale(ImageBuffer icon)
+		{
+			var hoverIcon = new ImageBuffer(icon);
+			ApplicationController.Instance.MakeGrayscale(hoverIcon);
+
+			return hoverIcon;
+		}
+
+		public override void OnMouseEnterBounds(MouseEventArgs mouseEvent)
+		{
+			imageWidget.Image = hoverImage;
+
+			base.OnMouseEnterBounds(mouseEvent);
+			this.Invalidate();
+		}
+
+		public override void OnMouseLeaveBounds(MouseEventArgs mouseEvent)
+		{
+			imageWidget.Image = normalImage;
+
+			base.OnMouseLeaveBounds(mouseEvent);
+			this.Invalidate();
+		}
+	}
 }
\ No newline at end of file
diff --git a/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs b/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
index e579363b1..f5001782f 100644
--- a/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
+++ b/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
@@ -335,13 +335,7 @@ namespace MatterHackers.MatterControl
 					theme),
 				advancedPanel);
 
-			var removeHoveredIcon = AggContext.StaticData.LoadIcon("remove.png", 16, 16, theme.InvertIcons);
-			var removeNormalIcon = new ImageBuffer(removeHoveredIcon);
-
-			//removeNormalIcon.NewGraphics2D().Render(removeHoveredIcon.ToGrayscale(), 0, 0);
-			ApplicationController.Instance.MakeGrayscale(removeNormalIcon);
-
-			var clearCacheButton = new IconButton(removeNormalIcon, removeHoveredIcon, theme)
+			var clearCacheButton = new HoverIconButton(AggContext.StaticData.LoadIcon("remove.png", 16, 16, theme.InvertIcons), theme)
 			{
 				ToolTipText = "Clear Cache".Localize(),
 			};
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 027c057a0..8196a4adf 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 027c057a0bb91bc75c8230c14c863908ce040abd
+Subproject commit 8196a4adf028fc0d5f22f5336584641a36915174