Font selection panel is now much faster in initalization.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@48 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs

@@ -24,15 +24,6 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
 		ICSharpCode.NRefactory.Parser.LookupTableVisitor lookupTableVisitor;
 		IProjectContent projectContent = null;
 		
-		public IProjectContent ProjectContent {
-			get {
-				return projectContent;
-			}
-			set {
-				projectContent = value;
-			}
-		}
-		
 		bool showStatic = false;
 		bool inNew = false;
 		
@@ -42,6 +33,14 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
 		int caretLine;
 		int caretColumn;
 		
+		public IProjectContent ProjectContent {
+			get {
+				return projectContent;
+			}
+			set {
+				projectContent = value;
+			}
+		}
 		
 		public ICompilationUnit CompilationUnit {
 			get {

src/Main/Base/Project/Src/Gui/Components/FontSelectionPanel.cs

@@ -65,12 +65,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 				((ComboBox)ControlDictionary["fontSizeComboBox"]).Items.Add(i);
 			}
 			((ComboBox)ControlDictionary["fontSizeComboBox"]).TextChanged += new EventHandler(UpdateFontPreviewLabel);
-			
 			foreach (FontFamily fontFamily in installedFontCollection.Families) {
-				if (fontFamily.IsStyleAvailable(FontStyle.Regular) && fontFamily.IsStyleAvailable(FontStyle.Bold)  && fontFamily.IsStyleAvailable(FontStyle.Italic)) {
+				if (fontFamily.IsStyleAvailable(FontStyle.Regular) && fontFamily.IsStyleAvailable(FontStyle.Bold) && fontFamily.IsStyleAvailable(FontStyle.Italic)) {
-					((ComboBox)ControlDictionary["fontListComboBox"]).Items.Add(new FontDescriptor(fontFamily.Name, IsMonospaced(fontFamily)));
+					((ComboBox)ControlDictionary["fontListComboBox"]).Items.Add(new FontDescriptor(fontFamily));
 				}
 			}
+			Console.WriteLine("GET FONTS DONE!!!");
 			((ComboBox)ControlDictionary["fontListComboBox"]).TextChanged += new EventHandler(UpdateFontPreviewLabel);
 			((ComboBox)ControlDictionary["fontListComboBox"]).SelectedIndexChanged += new EventHandler(UpdateFontPreviewLabel);
 			((ComboBox)ControlDictionary["fontListComboBox"]).MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.MeasureComboBoxItem);
@@ -91,21 +91,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		bool IsMonospaced(FontFamily fontFamily)
+	
-		{
-			using (Bitmap newBitmap = new Bitmap(1, 1)) {
-				using (Graphics g  = Graphics.FromImage(newBitmap)) {
-					using (Font f = new Font(fontFamily, 10)) {
-						// determine if the length of i == m because I see no other way of 
-						// getting if a font is monospaced or not.
-						int w1 = (int)g.MeasureString("i.", f).Width;
-						int w2 = (int)g.MeasureString("mw", f).Width;
-						return w1 == w2;
-					}
-				}
-			}
-		}
-		
 		public static Font ParseFont(string font)
 		{
 			try {
@@ -146,31 +132,42 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		class FontDescriptor
 		{
-			string name;
+			FontFamily fontFamily;
-			bool   isMonospaced;
+			bool       isMonospaced = false;
-			
+			bool       initializedMonospace = false;
 			public string Name {
 				get {
-					return name;
+					return fontFamily.Name;
-				}
-				set {
-					name = value;
 				}
 			}
 			
 			public bool IsMonospaced {
 				get {
+					if (!initializedMonospace) {
+						isMonospaced = GetIsMonospaced(fontFamily);
+					}
 					return isMonospaced;
 				}
-				set {
+			}
-					isMonospaced = value;
+			
+			bool GetIsMonospaced(FontFamily fontFamily)
+			{
+				using (Bitmap newBitmap = new Bitmap(1, 1)) {
+					using (Graphics g  = Graphics.FromImage(newBitmap)) {
+						using (Font f = new Font(fontFamily, 10)) {
+							// determine if the length of i == m because I see no other way of
+							// getting if a font is monospaced or not.
+							int w1 = (int)g.MeasureString("i.", f).Width;
+							int w2 = (int)g.MeasureString("mw", f).Width;
+							return w1 == w2;
+						}
+					}
 				}
 			}
 			
-			public FontDescriptor(string name, bool isMonospaced)
+			public FontDescriptor(FontFamily fontFamily)
 			{
-				this.name = name;
+				this.fontFamily = fontFamily;
-				this.isMonospaced = isMonospaced;
 			}
 		}
 		

src/Main/Base/Project/Src/Services/ParserService/IProjectContent.cs

@@ -27,6 +27,7 @@ namespace ICSharpCode.Core
 		XmlDoc XmlDoc {
 			get;
 		}
+		
 		ICollection<IClass> Classes {
 			get;
 		}