Author: igorz
Date: 2007-05-03 12:49:42 -0400 (Thu, 03 May 2007)
New Revision: 76629
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/ChangeLog
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
Log:
merged r76627-76628
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/ChangeLog
===================================================================
--- branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/ChangeLog
2007-05-03 16:47:09 UTC (rev 76628)
+++ branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/ChangeLog
2007-05-03 16:49:42 UTC (rev 76629)
@@ -1,3 +1,8 @@
+2007-05-03 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * ColorConverter.cs: fixed GetStandardValues() for TARGET_JVM
+ * Font.jvm.cs: fixed GetHeight()
+
2007-04-16 Sebastien Pouliot <[EMAIL PROTECTED]>
* Bitmap.cs: Add check in SetPixel for Format16bppGrayScale (but
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
2007-05-03 16:47:09 UTC (rev 76628)
+++
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
2007-05-03 16:49:42 UTC (rev 76629)
@@ -228,7 +228,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
// copy all colors except the first empty slot
Array colors = Array.CreateInstance (typeof
(Color), KnownColors.Values.Length - 1);
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
===================================================================
--- branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
2007-05-03 16:47:09 UTC (rev 76628)
+++ branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
2007-05-03 16:49:42 UTC (rev 76629)
@@ -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
