Previous changes created problems with the context-menu, as it was still referencing an icon that we dispose at icon size change. This change introduces a PropertyChanged event object to the CoreConfiguration so those interested can register to changes (currently only the IconSize), and apply the correct menu image.

GreenshotPlugin/Core/CoreConfiguration.cs

@@ -18,14 +18,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Windows.Forms;
+
 using Greenshot.IniFile;
 using Greenshot.Plugin;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.IO;
 using System.Reflection;
+using System.Windows.Forms;
 
 namespace GreenshotPlugin.Core {
 	public enum ClipboardFormat {
@@ -56,7 +58,9 @@ namespace GreenshotPlugin.Core {
 	/// Description of CoreConfiguration.
 	/// </summary>
 	[IniSection("Core", Description="Greenshot core configuration")]
-	public class CoreConfiguration : IniSection {
+	public class CoreConfiguration : IniSection, INotifyPropertyChanged {
+		public event PropertyChangedEventHandler PropertyChanged;
+
 		[IniProperty("Language", Description = "The language in IETF format (e.g. en-US)")]
 		public string Language;
 
@@ -256,8 +260,36 @@ namespace GreenshotPlugin.Core {
 		[IniProperty("LastCapturedRegion", Description = "The last used region, for reuse in the capture last region")]
 		public Rectangle LastCapturedRegion;
 
+		private Size _iconSize;
 		[IniProperty("IconSize", Description = "Defines the size of the icons (e.g. for the buttons in the editor), default value 16,16 anything bigger will cause scaling", DefaultValue = "16,16")]
-		public Size IconSize;
+		public Size IconSize {
+			get {
+				return _iconSize;
+			}
+			set {
+				Size newSize = value;
+				if (newSize != Size.Empty) {
+					if (newSize.Width < 16) {
+						newSize.Width = 16;
+					} else if (newSize.Width > 256) {
+						newSize.Width = 256;
+					}
+					newSize.Width = (newSize.Width / 16) * 16;
+					if (newSize.Height < 16) {
+						newSize.Height = 16;
+					} else if (IconSize.Height > 256) {
+						newSize.Height = 256;
+					}
+					newSize.Height = (newSize.Height / 16) * 16;
+				}
+				if (_iconSize != newSize) {
+					_iconSize = value;
+					if (PropertyChanged != null) {
+						PropertyChanged(this, new PropertyChangedEventArgs("IconSize"));
+					}
+				}
+			}
+		}
 
 		// Specifies what THIS build is
 		public BuildStates BuildState = BuildStates.RELEASE_CANDIDATE;
@@ -441,32 +473,7 @@ namespace GreenshotPlugin.Core {
 			if (OutputFileReduceColorsTo > 256) {
 				OutputFileReduceColorsTo = 256;
 			}
-			FixIconSize();
 		}
 
-		/// <summary>
-		/// Validation & correction of the icon size
-		/// </summary>
-		public void FixIconSize() {
-			if (IconSize == Size.Empty) {
-				IconSize = new Size(16, 16);
-			} else {
-				if (IconSize.Width < 16) {
-					IconSize.Width = 16;
-				}
-				if (IconSize.Width > 256) {
-					IconSize.Width = 256;
-				}
-				IconSize.Width = (IconSize.Width / 16) * 16;
-				if (IconSize.Height < 16) {
-					IconSize.Height = 16;
-				}
-				if (IconSize.Height > 256) {
-					IconSize.Height = 256;
-				}
-				IconSize.Height = (IconSize.Height/16)*16;
-			}
-
-		}
 	}
 }

GreenshotPlugin/Core/PluginUtils.cs

@@ -26,6 +26,7 @@ using log4net;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
@@ -40,6 +41,10 @@ namespace GreenshotPlugin.Core {
 		private const string PATH_KEY = @"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\";
 		private static IDictionary<string, Image> exeIconCache = new Dictionary<string, Image>();
 
+		static PluginUtils() {
+			conf.PropertyChanged += OnIconSizeChanged;
+		}
+
 		/// <summary>
 		/// Simple global property to get the Greenshot host
 		/// </summary>
@@ -48,18 +53,26 @@ namespace GreenshotPlugin.Core {
 			set;
 		}
 
-		public static void ClearExeIconCache() {
-			List<Image> cachedImages = new List<Image>();
-			lock (exeIconCache) {
-				foreach (string key in exeIconCache.Keys) {
-					cachedImages.Add(exeIconCache[key]);
+		/// <summary>
+		/// Clear icon cache
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private static void OnIconSizeChanged(object sender, PropertyChangedEventArgs e) {
+			if (e.PropertyName == "IconSize") {
+				List<Image> cachedImages = new List<Image>();
+				lock (exeIconCache) {
+					foreach (string key in exeIconCache.Keys) {
+						cachedImages.Add(exeIconCache[key]);
+					}
+					exeIconCache.Clear();
 				}
-				exeIconCache.Clear();
-			}
-			foreach (Image cachedImage in cachedImages) {
-				if (cachedImage != null) {
-					cachedImage.Dispose();
+				foreach (Image cachedImage in cachedImages) {
+					if (cachedImage != null) {
+						cachedImage.Dispose();
+					}
 				}
+
 			}
 		}