Skip to content

Commit 276d67e

Browse files
wise0704wise0704
committed
ImageListManager update 2
Code refactoring.
1 parent 13d1102 commit 276d67e

File tree

4 files changed

+56
-59
lines changed

4 files changed

+56
-59
lines changed

‎External/Plugins/ASCompletion/PluginUI.cs

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private void InitializeControls()
113113
InitializeComponent();
114114
treeIcons.ColorDepth = ColorDepth.Depth32Bit;
115115
treeIcons.ImageSize = ScaleHelper.Scale(new Size(16, 16));
116-
treeIcons.Initialize(TreeIcons_OnInitialize);
116+
treeIcons.Initialize(TreeIcons_Initialize);
117117

118118
toolStrip.Renderer = new DockPanelStripRenderer();
119119
toolStrip.ImageScalingSize = ScaleHelper.Scale(new Size(16, 16));
@@ -140,48 +140,53 @@ private void InitializeControls()
140140
outlineTree.BringToFront();
141141
}
142142

143-
private void TreeIcons_OnInitialize(object sender, EventArgs e)
143+
private void TreeIcons_Initialize(object sender, EventArgs e)
144144
{
145145
treeIcons.Images.AddRange(new Image[]
146146
{
147-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("FilePlain.png"))),
148-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("FolderClosed.png"))),
149-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("FolderOpen.png"))),
150-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("CheckAS.png"))),
151-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("QuickBuild.png"))),
152-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Package.png"))),
153-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Interface.png"))),
154-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Intrinsic.png"))),
155-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Class.png"))),
156-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Variable.png"))),
157-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariableProtected.png"))),
158-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariablePrivate.png"))),
159-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariableStatic.png"))),
160-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariableStaticProtected.png"))),
161-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariableStaticPrivate.png"))),
162-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Const.png"))),
163-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("ConstProtected.png"))),
164-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("ConstPrivate.png"))),
165-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Const.png"))),
166-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("ConstProtected.png"))),
167-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("ConstPrivate.png"))),
168-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Method.png"))),
169-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodProtected.png"))),
170-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodPrivate.png"))),
171-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodStatic.png"))),
172-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodStaticProtected.png"))),
173-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodStaticPrivate.png"))),
174-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Property.png"))),
175-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyProtected.png"))),
176-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyPrivate.png"))),
177-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyStatic.png"))),
178-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyStaticProtected.png"))),
179-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyStaticPrivate.png"))),
180-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Template.png"))),
181-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Declaration.png")))
147+
GetImage("FilePlain.png"),
148+
GetImage("FolderClosed.png"),
149+
GetImage("FolderOpen.png"),
150+
GetImage("CheckAS.png"),
151+
GetImage("QuickBuild.png"),
152+
GetImage("Package.png"),
153+
GetImage("Interface.png"),
154+
GetImage("Intrinsic.png"),
155+
GetImage("Class.png"),
156+
GetImage("Variable.png"),
157+
GetImage("VariableProtected.png"),
158+
GetImage("VariablePrivate.png"),
159+
GetImage("VariableStatic.png"),
160+
GetImage("VariableStaticProtected.png"),
161+
GetImage("VariableStaticPrivate.png"),
162+
GetImage("Const.png"),
163+
GetImage("ConstProtected.png"),
164+
GetImage("ConstPrivate.png"),
165+
GetImage("Const.png"),
166+
GetImage("ConstProtected.png"),
167+
GetImage("ConstPrivate.png"),
168+
GetImage("Method.png"),
169+
GetImage("MethodProtected.png"),
170+
GetImage("MethodPrivate.png"),
171+
GetImage("MethodStatic.png"),
172+
GetImage("MethodStaticProtected.png"),
173+
GetImage("MethodStaticPrivate.png"),
174+
GetImage("Property.png"),
175+
GetImage("PropertyProtected.png"),
176+
GetImage("PropertyPrivate.png"),
177+
GetImage("PropertyStatic.png"),
178+
GetImage("PropertyStaticProtected.png"),
179+
GetImage("PropertyStaticPrivate.png"),
180+
GetImage("Template.png"),
181+
GetImage("Declaration.png")
182182
});
183183
}
184184

185+
private static Image GetImage(String name)
186+
{
187+
return PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream(name)));
188+
}
189+
185190
public static System.IO.Stream GetStream(String name)
186191
{
187192
String prefix = "ASCompletion.Icons.";

‎External/Plugins/BookmarkPanel/PluginUI.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,13 @@ private void InitializeGraphics()
231231
this.imageList = new ImageListManager();
232232
this.imageList.ImageSize = ScaleHelper.Scale(new Size(16, 16));
233233
this.imageList.ColorDepth = ColorDepth.Depth32Bit;
234-
this.imageList.Initialize(ImageList_OnInitialize);
234+
this.imageList.Initialize(ImageList_Initialize);
235235
this.listView.SmallImageList = this.imageList;
236236
this.removeBookmarksItem.Image = PluginBase.MainForm.FindImage("402|4|4|4");
237237
this.searchButton.Image = PluginBase.MainForm.FindImage("484|26|-4|4");
238238
}
239239

240-
private void ImageList_OnInitialize(object sender, EventArgs e)
240+
private void ImageList_Initialize(object sender, EventArgs e)
241241
{
242242
this.imageList.Images.Add("Bookmark", PluginBase.MainForm.FindImageAndSetAdjust("559|26|0|1"));
243243
this.imageList.Images.Add("Info", PluginBase.MainForm.FindImageAndSetAdjust("229"));

‎External/Plugins/FileExplorer/PluginUI.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,18 +292,13 @@ private void InitializeGraphics()
292292
this.imageList = new ImageListManager();
293293
this.imageList.ImageSize = ScaleHelper.Scale(new Size(16, 16));
294294
this.imageList.ColorDepth = ColorDepth.Depth32Bit;
295-
this.imageList.OnInitialize += ImageList_Initialize;
295+
this.imageList.OnInitialize += RefreshFileView;
296296
this.AddNonWin32Images();
297297
this.syncronizeButton.Image = PluginBase.MainForm.FindImage("203|9|-3|-3");
298298
this.browseButton.Image = PluginBase.MainForm.FindImage("203");
299299
this.fileView.SmallImageList = this.imageList;
300300
}
301301

302-
private void ImageList_Initialize(object sender, EventArgs e)
303-
{
304-
RefreshFileView(null, null);
305-
}
306-
307302
/// <summary>
308303
/// Applies localized texts to the control
309304
/// </summary>

‎FlashDevelop/Managers/ImageManager.cs

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public static Image GetComposedBitmap(string data, bool autoAdjusted)
8484
var imagePair = Cache[key];
8585
return imagePair.Adjusted ?? AddAutoAdjustImage(imagePair);
8686
}
87-
8887
return Cache[key].Original;
8988
}
9089

@@ -95,13 +94,10 @@ public static Image GetComposedBitmapSize16(string data, bool autoAdjusted)
9594
{
9695
if (Size == Size16) return GetComposedBitmap(data, autoAdjusted);
9796

98-
var c = Components.Parse(data, Size16);
99-
string key = c.Key;
100-
97+
string key = Components.Parse(data, Size16).Key;
10198
if (!Cache.ContainsKey(key))
10299
{
103100
var image32 = GetComposedBitmap(data, false);
104-
105101
int size = ScaleHelper.Scale(Size16);
106102
var image16 = new Bitmap(size, size);
107103

@@ -123,7 +119,7 @@ public static Image GetComposedBitmapSize16(string data, bool autoAdjusted)
123119
}
124120
return Cache[key].Original;
125121
}
126-
122+
127123
/// <summary>
128124
/// Gets an adjusted copy of the specified image.
129125
/// </summary>
@@ -178,7 +174,7 @@ public static void AdjustAllImages()
178174
else ImageKonverter.ImageAdjust(imagePair.Original, adjusted, saturation, brightness);
179175
}
180176
}
181-
177+
182178
/// <summary>
183179
/// Adds a pair to the update list.
184180
/// </summary>
@@ -195,12 +191,13 @@ static bool GetImageAdjustments(out int saturation, out int brightness)
195191
{
196192
switch (Globals.MainForm.GetThemeValue("ImageManager.ImageSet"))
197193
{
198-
case "Bright": saturation = 20; brightness = 0; return true;
199-
case "Dim": saturation = -5; brightness = -2; return true;
200-
case "Dark": saturation = -5; brightness = -10; return true;
201-
case "Darker": saturation = -20; brightness = -20; return true;
202-
case "Black": saturation = -50; brightness = -25; return true;
203-
default: saturation = 0; brightness = 0; return false;
194+
default:
195+
case "Default": saturation = 0; brightness = 0; return false;
196+
case "Bright": saturation = 20; brightness = 0; return true;
197+
case "Dim": saturation = -5; brightness = -2; return true;
198+
case "Dark": saturation = -5; brightness = -10; return true;
199+
case "Darker": saturation = -20; brightness = -20; return true;
200+
case "Black": saturation = -50; brightness = -25; return true;
204201
}
205202
}
206203

@@ -286,7 +283,7 @@ public ImagePair(Image original, Image adjusted)
286283
this.original = original;
287284
this.adjusted = new WeakReference(adjusted);
288285
}
289-
286+
290287
/// <summary>
291288
/// The original image.
292289
/// </summary>

0 commit comments

Comments
 (0)