2008-06-03 Ivan N. Zlatev <contact@i-nz.net>

[mono.git] / mcs / class / System.Drawing.Design / System.Drawing.Design / FontNameEditor.cs

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/FontNameEditor.cs b/mcs/class/System.Drawing.Design/System.Drawing.Design/FontNameEditor.cs
index db9297469966903eec6e2130956c175293391b00..09ee3ece62c4ff0773a1d0f325b84938c3a7be61 100644 (file)
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/FontNameEditor.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/FontNameEditor.cs
@@ -57,10 +57,11 @@ namespace System.Drawing.Design
                        G.FillRectangle (SystemBrushes.ActiveCaption, e.Bounds);
 
                        // Draw the sample string
-                       if (e.Value != null)
-                       {
-                               Font F = (Font) e.Value;
-                               G.DrawString (PreviewString, F, SystemBrushes.ActiveCaptionText, e.Bounds);
+                       string fontName = e.Value as string;
+                       if (fontName != null && fontName.Length > 0) {
+                               using (Font font = new Font (fontName, e.Bounds.Height, FontStyle.Regular, GraphicsUnit.Pixel)) {
+                                       G.DrawString (PreviewString, font, SystemBrushes.ActiveCaptionText, e.Bounds);
+                               }
                        }
 
                        // Draw the border again to ensure it is not overlapped by the text