DrawMargin, refactoring

svn path=/trunk/mcs/; revision=52960

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index c52297496d822163e33a784d369ffd6172ec4455..7fb06aa90c45b158eb6a8357f089dad17d02206a 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-13 Konstantin Triger <kostat@mainsoft.com>
+
+        * FontFamily.jvm.cs: DrawMargin, refactoring.
+
 2005-11-13 Konstantin Triger <kostat@mainsoft.com>
 
         * Graphics.jvm.cs, Pen.jvm.cs, AdvancedStroke.jvm.cs:

diff --git a/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs b/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs
index af3d5272cb626118c7de220dc22f375998df783e..92b16d62e8f1baf9df34a0793b1b1cacef79fa1d 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs
+++ b/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs
@@ -62,6 +62,8 @@ namespace System.Drawing {
 
                // this is unavailable through Java API, usually 2048 for TT fonts
                const int UnitsPerEm = 2048;
+               // the margin for text drawing
+               const int DrawMargin = 571;
 
                #region ctors
                
@@ -106,6 +108,10 @@ namespace System.Drawing {
                        }
                }
 
+               internal int GetDrawMargin(FontStyle style) {
+                       return DrawMargin;
+               }
+
                awt.FontMetrics GetMetrics(FontStyle style) {
                        if ((_lastStyle != style) || (_fontMetrics == null)) {  
                                java.util.Map attrib = Font.DeriveStyle( FamilyFont.getAttributes(), style, true);
@@ -132,15 +138,9 @@ namespace System.Drawing {
                }
 
                public string GetName(int language) {
-                       CultureInfo culture;
-                       java.util.Locale locale;
-                       try {
-                               culture = new CultureInfo(language, false);
-                               locale = vmw.@internal.EnvironmentUtils.getLocaleFromCultureInfo( culture );
-                       }
-                       catch(Exception) {
-                               locale = new java.util.Locale("en");
-                       }
+                       CultureInfo culture = new CultureInfo(language, false);
+                       java.util.Locale locale = vmw.@internal.EnvironmentUtils.getLocaleFromCultureInfo( culture );
+
                        return FamilyFont.getFamily( locale );
                }