Author: kostat
Date: 2005-12-14 02:05:54 -0500 (Wed, 14 Dec 2005)
New Revision: 54347
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/ChangeLog
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/StrokeFactory.jvm.cs
Log:
merge -r 54345:54346
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/ChangeLog
===================================================================
--- branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/ChangeLog
2005-12-14 07:01:13 UTC (rev 54346)
+++ branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/ChangeLog
2005-12-14 07:05:54 UTC (rev 54347)
@@ -1,3 +1,7 @@
+2005-12-14 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * StrokeFactory.jvm.cs: create AdvancedStroke when have penTransform.
+
2005-12-13 Konstantin Triger <[EMAIL PROTECTED]>
* Bitmap.jvm.cs: Fix MakeTransparent.
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/StrokeFactory.jvm.cs
===================================================================
---
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/StrokeFactory.jvm.cs
2005-12-14 07:01:13 UTC (rev 54346)
+++
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/StrokeFactory.jvm.cs
2005-12-14 07:05:54 UTC (rev 54347)
@@ -18,7 +18,9 @@
public awt.Stroke Create(float width, int cap, int
join, float miterlimit, float[] dash, float dash_phase, geom.AffineTransform
penTransform,
geom.AffineTransform outputTransform, PenFit
penFit) {
- if ((outputTransform == null ||
outputTransform.isIdentity()) && (penFit == PenFit.NotThin))
+ if ((penFit == PenFit.NotThin) &&
+ (outputTransform == null ||
outputTransform.isIdentity()) &&
+ (penTransform == null ||
penTransform.isIdentity()))
return new awt.BasicStroke(width, cap,
join, miterlimit, dash, dash_phase);
return new System.Drawing.AdvancedStroke(width,
cap, join, miterlimit, dash, dash_phase, penTransform, outputTransform, penFit);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches