diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2017-01-05 15:47:33 +0100 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2017-01-05 15:47:33 +0100 |
| commit | 49346012274739fd39745f9e035ee8853149bc73 (patch) | |
| tree | b8757165c6b31a6d08b7caad2118ed76f463c287 /src/Rectangle.cs | |
| parent | 9c0f77e860a1852ee7de381a82118e6d8c7fb819 (diff) | |
| parent | 40b16003066ad42604fd82dc0eec9cfa0a4abeca (diff) | |
Merge branch 'master' into CrowIDE
Diffstat (limited to 'src/Rectangle.cs')
| -rw-r--r-- | src/Rectangle.cs | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/src/Rectangle.cs b/src/Rectangle.cs index 9a4ef396..cc1aa56f 100644 --- a/src/Rectangle.cs +++ b/src/Rectangle.cs @@ -7,6 +7,7 @@ namespace Crow { public struct Rectangle { + internal static Type TRectangle = typeof(Rectangle); #region private fields int _x; int _y; @@ -200,34 +201,7 @@ namespace Crow { return r1.TopLeft == r2.TopLeft && r1.Size == r2.Size ? false : true; } - #endregion - - public RectanglesRelations test(Rectangle r) - { - if (r == this) - return RectanglesRelations.Equal; - - int nbrPtIncluded = 0; - - if (this.ContainsOrIsEqual(r.TopLeft)) - nbrPtIncluded++; - if (this.ContainsOrIsEqual(r.TopRight)) - nbrPtIncluded++; - if (this.ContainsOrIsEqual(r.BottomLeft)) - nbrPtIncluded++; - if (this.ContainsOrIsEqual(r.BottomRight)) - nbrPtIncluded++; - - switch (nbrPtIncluded) - { - case 0: - return RectanglesRelations.NoRelation; - case 4: - return RectanglesRelations.Contains; - default: - return RectanglesRelations.Intersect; - } - } + #endregion public static readonly Rectangle Zero = new Rectangle(0, 0, 0, 0); public static Rectangle Empty @@ -262,7 +236,7 @@ namespace Crow } public override bool Equals (object obj) { - return (obj == null || obj.GetType() != typeof(Rectangle)) ? + return (obj == null || obj.GetType() != TRectangle) ? false : this == (Rectangle)obj; } |