Skip to content

Commit 69280a1

Browse files
committed
CGL
1 parent 3f6d15c commit 69280a1

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

ColorSetKit/ColorSet.cs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@ namespace ColorSetKit
3333
{
3434
public partial class ColorSet
3535
{
36-
private static readonly ulong Magic = 0x434F4C4F52534554;
37-
private static ColorSet _Shared = null;
38-
private static object _SharedLock = new object();
36+
private static readonly ulong Magic = 0x434F4C4F52534554;
37+
private static ColorSet SharedInstance = null;
38+
private static readonly object SharedLock = new object();
3939

4040
public static ColorSet Shared
4141
{
4242
get
4343
{
44-
lock( _SharedLock )
44+
lock( SharedLock )
4545
{
46-
if( _Shared == null )
46+
if( SharedInstance == null )
4747
{
4848
string path = Assembly.GetExecutingAssembly().Location;
49-
50-
_Shared = new ColorSet( System.IO.Path.Combine( System.IO.Path.GetDirectoryName( path ), "Colors.colorset" ) );
49+
50+
SharedInstance = new ColorSet( System.IO.Path.Combine( System.IO.Path.GetDirectoryName( path ), "Colors.colorset" ) );
5151
}
5252

53-
return _Shared;
53+
return SharedInstance;
5454
}
5555
}
5656
}
@@ -192,12 +192,13 @@ public Data Data
192192
{
193193
Dictionary< string, ColorPair > colors = this.Colors;
194194
ColorSetStream stream = new ColorSetStream();
195-
System.Windows.Media.Color clear = new System.Windows.Media.Color();
196-
197-
clear.R = 0;
198-
clear.G = 0;
199-
clear.B = 0;
200-
clear.A = 0;
195+
System.Windows.Media.Color clear = new System.Windows.Media.Color
196+
{
197+
R = 0,
198+
G = 0,
199+
B = 0,
200+
A = 0
201+
};
201202

202203
stream += Magic; /* COLORSET */
203204
stream += ( uint )1; /* Major */

0 commit comments

Comments
 (0)