Author: igorz
Date: 2007-05-03 12:47:09 -0400 (Thu, 03 May 2007)
New Revision: 76628
Modified:
trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog
trunk/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
trunk/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
Log:
2007-05-03 Igor Zelmanovich <[EMAIL PROTECTED]>
* ColorConverter.cs: fixed GetStandardValues() for TARGET_JVM
* Font.jvm.cs: fixed GetHeight()
Modified: trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog 2007-05-03
16:43:52 UTC (rev 76627)
+++ trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog 2007-05-03
16:47:09 UTC (rev 76628)
@@ -1,3 +1,8 @@
+2007-05-03 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * ColorConverter.cs: fixed GetStandardValues() for TARGET_JVM
+ * Font.jvm.cs: fixed GetHeight()
+
2007-05-02 Sebastien Pouliot <[EMAIL PROTECTED]>
* gdipEnums.cs: Add GetSysColorIndex
Modified: trunk/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
2007-05-03 16:43:52 UTC (rev 76627)
+++ trunk/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
2007-05-03 16:47:09 UTC (rev 76628)
@@ -225,7 +225,8 @@
if (cached != null)
return cached;
#if TARGET_JVM
- Color [] colors = (Color [])
KnownColors.Values.Clone ();
+ Color [] colors = new Color
[KnownColors.Values.Length - 1];
+ Array.Copy (KnownColors.Values, 1, colors, 0,
colors.Length);
#else
Array colors = Array.CreateInstance (typeof
(Color), KnownColors.ArgbValues.Length - 1);
for (int i=1; i <
KnownColors.ArgbValues.Length; i++) {
Modified: trunk/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs 2007-05-03
16:43:52 UTC (rev 76627)
+++ trunk/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs 2007-05-03
16:47:09 UTC (rev 76628)
@@ -223,11 +223,8 @@
public float GetHeight (Graphics graphics) {
if (graphics == null)
- throw new ArgumentNullException ("graphics");
-
- awt.Font f = NativeObject.deriveFont
(graphics.GetFinalTransform ());
- return (FontFamily.GetLineSpacing (Style) /
FontFamily.GetEmHeight (Style))
- * (f.getSize2D () / _screenResolutionConverter
[(int) Unit]);
+ throw new ArgumentNullException ("graphics");
+ return GetHeight (graphics.DpiY);
}
public bool Italic {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
