Merge pull request #981 from wise0704/ImageManager

Fixes to the bug of image colors not adjusting according to the theme.

Author: Meychi

External/Plugins/CodeRefactor/RefactorItem.cs

@@ -25,7 +25,7 @@ public RefactorItem(ToolStripItem item)
             this.item = item;
             label = Regex.Replace(item.Text, "[&.]", string.Empty);
             description = TextHelper.GetString("Label.Refactor").Replace("&", string.Empty);
-            icon = new Bitmap(item.Image ?? PluginBase.MainForm.FindImage("452")); //452 or 473
+            icon = (Bitmap) (item.Image ?? PluginBase.MainForm.FindImage("452")); //452 or 473
         }
 
         public string Description

External/Plugins/ProjectManager/Controls/Icons.cs

@@ -208,7 +208,7 @@ public static FDImage GetResource(string resourceID)
             catch {
                 image = new Bitmap(16, 16);
             }
-            image = (Bitmap)PluginBase.MainForm.ImageSetAdjust(image);
+            image = (Bitmap)PluginBase.MainForm.GetAutoAdjustedImage(image);
             imageList.Images.Add(ScaleHelper.Scale(image));
             return new FDImage(image,imageList.Images.Count-1);
         }
@@ -255,7 +255,7 @@ public static FDImage ExtractIconIfNecessary(string file)
             {
                 Icon icon = IconExtractor.GetFileIcon(file, true);
                 Image image = ScaleHelper.Scale(icon.ToBitmap());
-                image = (Bitmap)PluginBase.MainForm.ImageSetAdjust(image);
+                image = (Bitmap)PluginBase.MainForm.GetAutoAdjustedImage(image);
                 icon.Dispose(); imageList.Images.Add(image);
                 int index = imageList.Images.Count - 1; // of the icon we just added
                 FDImage fdImage = new FDImage(image, index);

External/Plugins/SourceControl/Managers/OverlayManager.cs

@@ -174,7 +174,7 @@ static public void Init()
 
         private static Image GetSkin()
         {
-            return PluginBase.MainForm.ImageSetAdjust(ProjectWatcher.Skin); //can be changed by external SC-Plugin
+            return PluginBase.MainForm.GetAutoAdjustedImage(ProjectWatcher.Skin); //can be changed by external SC-Plugin
         }
 
         static public void Reset()

FlashDevelop/MainForm.cs

@@ -1681,11 +1681,58 @@ public IPlugin FindPlugin(String guid)
         }
 
         /// <summary>
-        /// Adjusts the image for different themes
+        /// Finds the specified composed/ready image that is automatically adjusted according to the theme.
+        /// <para/>
+        /// If you make a copy of the image returned by this method, the copy will not be automatically adjusted.
+        /// </summary>
+        public Image FindImage(String data)
+        {
+            return FindImage(data, true);
+        }
+
+        /// <summary>
+        /// Finds the specified composed/ready image.
+        /// <para/>
+        /// If you make a copy of the image returned by this method, the copy will not be automatically adjusted, even if <code>autoAdjusted</code> is <code>true</code>.
+        /// </summary>
+        public Image FindImage(String data, Boolean autoAdjusted)
+        {
+            try
+            {
+                lock (this)
+                {
+                    return ImageManager.GetComposedBitmap(data, autoAdjusted);
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorManager.ShowError(ex);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a copy of the specified image that has its color adjusted.
         /// </summary>
         public Image ImageSetAdjust(Image image)
         {
-            return ImageManager.AdjustImage(image);
+            return ImageManager.SetImageAdjustment(image);
+        }
+
+        /// <summary>
+        /// Gets a copy of the image that gets automatically adjusted according to the theme.
+        /// </summary>
+        public Image GetAutoAdjustedImage(Image image)
+        {
+            return ImageManager.GetAutoAdjustedImage(image);
+        }
+
+        /// <summary>
+        /// Adjusts all images for different themes.
+        /// </summary>
+        public void AdjustAllImages()
+        {
+            ImageManager.AdjustAllImages();
         }
 
         /// <summary>
@@ -1831,25 +1878,6 @@ public void ApplySecondaryShortcut(ToolStripItem item)
             ShortcutManager.ApplySecondaryShortcut(item);
         }
 
-        /// <summary>
-        /// Finds the specified composed/ready image
-        /// </summary>
-        public Image FindImage(String data)
-        {
-            try
-            {
-                lock (this)
-                {
-                    return ImageManager.GetComposedBitmap(data);
-                }
-            }
-            catch (Exception ex)
-            {
-                ErrorManager.ShowError(ex);
-                return null;
-            }
-        }
-
         /// <summary>
         /// Shows the settings dialog
         /// </summary>

FlashDevelop/Managers/ImageManager.cs

@@ -7,24 +7,23 @@
 
 namespace FlashDevelop.Managers
 {
-    class ImageManager
+    static class ImageManager
     {
-        public static Int32 X;
-        public static Int32 Y;
-        public static Int32 Size;
-        public static Int32 Icon;
-        public static Int32 Bullet;
-        public static Int32 Padding;
-        public static Bitmap Source;
-        public static Dictionary<String, Bitmap> Cache;
+        static readonly int Size;
+        static readonly int Padding;
+        static readonly Bitmap Source;
+        static readonly Dictionary<string, ImagePair> Cache;
+        static readonly List<ImagePair> AutoAdjusted;
 
         /// <summary>
         /// Static constructor 
         /// </summary>
         static ImageManager()
         {
-            Double scale = ScaleHelper.GetScale();
-            Cache = new Dictionary<String, Bitmap>();
+            double scale = ScaleHelper.GetScale();
+            Cache = new Dictionary<string, ImagePair>();
+            AutoAdjusted = new List<ImagePair>();
+
             if (scale >= 1.5)
             {
                 Size = 32;
@@ -37,80 +36,180 @@ static ImageManager()
                 Padding = 0;
                 Source = new Bitmap(FileNameHelper.Images);
             }
-            Source = (Bitmap)AdjustImage(Source);
         }
 
         /// <summary>
-        /// Adjusts the image for different themes
+        /// Composes an icon from image data.
         /// </summary>
-        public static Image AdjustImage(Image image)
+        public static Image GetComposedBitmap(string data, bool autoAdjusted)
         {
-            String style = Globals.MainForm.GetThemeValue("ImageManager.ImageSet");
-            if (style == "Bright") return ImageKonverter.ImageAdjust(image, 20, 0);
-            else if (style == "Dim") return ImageKonverter.ImageAdjust(image, -5, -2);
-            else if (style == "Dark") return ImageKonverter.ImageAdjust(image, -5, -10);
-            else if (style == "Darker") return ImageKonverter.ImageAdjust(image, -20, -20);
-            else if (style == "Black") return ImageKonverter.ImageAdjust(image, -50, -25);
-            else return image;
+            if (!Cache.ContainsKey(data))
+            {
+                int x, y, icon, bullet, rx, ry;
+                var original = new Bitmap(Size, Size);
+                var graphics = Graphics.FromImage(original);
+                var destRect = new Rectangle(Padding, Padding, Size - (Padding * 2), Size - (Padding * 2));
+
+                ProcessImageData(data, out x, out y, out icon, out bullet);
+                graphics.Clear(Color.Transparent);
+
+                if (icon >= 0)
+                {
+                    rx = (icon % 16) * Size;
+                    ry = (icon / 16) * Size;
+                    graphics.DrawImage(Source, destRect, new Rectangle(rx, ry, Size, Size), GraphicsUnit.Pixel);
+                }
+                if (bullet >= 0)
+                {
+                    rx = (bullet % 16) * Size;
+                    ry = (bullet / 16) * Size;
+                    destRect.X += (Size == 32) ? x * 2 : x;
+                    destRect.Y += (Size == 32) ? y * 2 : y;
+                    graphics.DrawImage(Source, destRect, new Rectangle(rx, ry, Size, Size), GraphicsUnit.Pixel);
+                }
+
+                graphics.Dispose();
+                original = ScaleHelper.Scale(original);
+                Cache[data] = new ImagePair(original);
+            }
+
+
+            if (autoAdjusted)
+            {
+                var imagePair = Cache[data];
+                return imagePair.Adjusted ?? AddAutoAdjustImage(imagePair);
+            }
+            return Cache[data].Original;
         }
 
         /// <summary>
-        /// Composes an icon from Image data
+        /// Gets an adjusted copy of the specified image.
         /// </summary>
-        public static Bitmap GetComposedBitmap(String data)
+        public static Image SetImageAdjustment(Image original)
         {
-            if (Cache.ContainsKey(data))
+            int saturation, brightness;
+            if (GetImageAdjustments(out saturation, out brightness))
             {
-                return Cache[data];
+                return ImageKonverter.ImageAdjust(original, saturation, brightness);
             }
-            ProcessImageData(data);
-            Bitmap composed = new Bitmap(Size, Size);
-            Graphics destination = Graphics.FromImage(composed);
-            destination.Clear(Color.Transparent);
-            Int32 rx; Int32 ry;
-            if (Icon >= 0)
-            {
-                rx = (Icon % 16) * Size;
-                ry = (Icon / 16) * Size;
-                destination.DrawImage(Source, new Rectangle(Padding, Padding, Size - (Padding * 2), Size - (Padding * 2)), new Rectangle(rx, ry, Size, Size), GraphicsUnit.Pixel);
-            }
-            if (Bullet >= 0)
+            return new Bitmap(original);
+        }
+
+        /// <summary>
+        /// Gets a copy of the image that changes color according to the theme.
+        /// </summary>
+        public static Image GetAutoAdjustedImage(Image image)
+        {
+            return AddAutoAdjustImage(new ImagePair(image));
+        }
+
+        /// <summary>
+        /// Adjust colors of all cached images.
+        /// </summary>
+        public static void AdjustAllImages()
+        {
+            int saturation, brightness;
+            GetImageAdjustments(out saturation, out brightness);
+
+            for (int i = 0, length = AutoAdjusted.Count; i < length; i++)
             {
-                rx = (Bullet % 16) * Size;
-                ry = (Bullet / 16) * Size;
-                X = (Size == 32) ? X * 2 : X;
-                Y = (Size == 32) ? Y * 2 : Y;
-                destination.DrawImage(Source, new Rectangle(X + Padding, Y + Padding, Size - (Padding * 2), Size - (Padding * 2)), new Rectangle(rx, ry, Size, Size), GraphicsUnit.Pixel);
+                var imagePair = AutoAdjusted[i];
+                var adjusted = imagePair.Adjusted;
+                if (adjusted == null)
+                {
+                    AutoAdjusted.RemoveAt(i--);
+                    length--;
+                }
+                else ImageKonverter.ImageAdjust(imagePair.Original, adjusted, saturation, brightness);
             }
-            composed = ScaleHelper.Scale(composed);
-            Cache[data] = composed;
-            return composed;
         }
 
         /// <summary>
         /// Processes data from "icon|bullet|x|y" or just index
         /// </summary>
-        private static void ProcessImageData(String data)
+        static void ProcessImageData(string data, out int x, out int y, out int icon, out int bullet)
         {
-            X = Y = 0;
-            Icon = Bullet = -1;
+            x = y = 0;
+            icon = bullet = -1;
             if (string.IsNullOrEmpty(data)) return;
-            String[] par = data.Split('|');
-            if (par.Length > 0)
+
+            string[] args = data.Split('|');
+            if (args.Length == 0 || !int.TryParse(args[0], out icon)) return;
+            if (args.Length == 1 || !int.TryParse(args[1], out bullet)) return;
+            if (bullet < 0 || args.Length < 4) return;
+            int.TryParse(args[2], out x);
+            int.TryParse(args[3], out y);
+        }
+
+        /// <summary>
+        /// Adds a pair to the update list.
+        /// </summary>
+        static Image AddAutoAdjustImage(ImagePair pair)
+        {
+            AutoAdjusted.Add(pair);
+            return pair.Adjusted = SetImageAdjustment(pair.Original);
+        }
+
+        /// <summary>
+        /// Gets the appropriate color adjustment components.
+        /// </summary>
+        static bool GetImageAdjustments(out int saturation, out int brightness)
+        {
+            switch (Globals.MainForm.GetThemeValue("ImageManager.ImageSet"))
             {
-                Int32.TryParse(par[0], out Icon);
-                if (par.Length > 1)
-                {
-                    Int32.TryParse(par[1], out Bullet);
-                    if (Bullet >= 0 && par.Length == 4)
-                    {
-                        Int32.TryParse(par[2], out X);
-                        Int32.TryParse(par[3], out Y);
-                    }
-                }
+                case "Bright": saturation =  20; brightness =   0; return true;
+                case "Dim":    saturation =  -5; brightness =  -2; return true;
+                case "Dark":   saturation =  -5; brightness = -10; return true;
+                case "Darker": saturation = -20; brightness = -20; return true;
+                case "Black":  saturation = -50; brightness = -25; return true;
+                default:       saturation =   0; brightness =   0; return false;
             }
         }
 
+        /// <summary>
+        /// A pair of images used for tracking original and adjusted.
+        /// </summary>
+        class ImagePair
+        {
+            Image original;
+            WeakReference adjusted;
+
+            /// <summary>
+            /// The original image.
+            /// </summary>
+            public Image Original
+            {
+                get { return original; }
+            }
+
+            /// <summary>
+            /// The copy of <see cref="Original"/> that changes color according to the theme.
+            /// </summary>
+            public Image Adjusted
+            {
+                get { return adjusted.Target as Image; }
+                set { adjusted.Target = value; }
+            }
+
+            /// <summary>
+            /// Creates an instance of <see cref="ImagePair"/>.
+            /// </summary>
+            /// <param name="original"><see cref="Original"/></param>
+            public ImagePair(Image original) : this(original, null)
+            {
+            }
+
+            /// <summary>
+            /// Creates an instance of <see cref="ImagePair"/>.
+            /// </summary>
+            /// <param name="original"><see cref="Original"/></param>
+            /// <param name="adjusted"><see cref="Adjusted"/></param>
+            public ImagePair(Image original, Image adjusted)
+            {
+                this.original = original;
+                this.adjusted = new WeakReference(adjusted);
+            }
+        }
     }
 
 }

FlashDevelop/Managers/ThemeManager.cs

@@ -117,6 +117,7 @@ public static void WalkControls(Object obj)
                 {
                     NotifyEvent ne = new NotifyEvent(EventType.ApplyTheme);
                     EventManager.DispatchEvent(Globals.MainForm, ne);
+                    Globals.MainForm.AdjustAllImages();
                     Globals.MainForm.Refresh();
                 }
             }