Rework RectangleF.Contains to not do equality comparison on floating …

…point values. Fixes mono#5985.
midnite8177 · Jul 5, 2012 · 53f463e · 53f463e
1 parent 667e99b
commit 53f463e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/mcs/class/System.Drawing/System.Drawing/RectangleF.cs b/mcs/class/System.Drawing/System.Drawing/RectangleF.cs
@@ -487,7 +487,7 @@ public bool Contains (PointF pt)
 
 		public bool Contains (RectangleF rect)
 		{
-			return (rect == Intersect (this, rect));
+			return X <= rect.X && Right >= rect.Right && Y <= rect.Y && Bottom >= rect.Bottom;
 		}
 
 		/// <summary>

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleF.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleF.cs
@@ -68,6 +68,16 @@ public void Contains ()
 			Assert.IsFalse (rect_0.Contains (50, 10), "g");
 		}
 
+		[Test]
+		public void ContainsF ()
+		{
+			// from bug #5985
+			RectangleF outer = new RectangleF (100, 150, 300, 300);
+			RectangleF inner = new RectangleF (139.3323f, 188.4053f, 140.2086f, 210.3129f);
+
+			Assert.IsTrue (outer.Contains (inner), "a");
+		}
+
 		[Test]
 		public void Empty ()
 		{