Changeset 32 for Include/Classes/System

Timestamp:

Dec 13, 2006, 9:19:48 PM (18 years ago)

Author:

OverTaker

Message:

Rectangleと同様の修正

File:

• Include/Classes/System/Drawing/RectangleF.ab (modified) (8 diffs)

Include/Classes/System/Drawing/RectangleF.ab

@@ -26 +26 @@
     Sub RectangleF(location As PointF, size As SizeF)
         x = location.X
-        y = lccation.Y
+        y = location.Y
         width = size.Height
-        hegiht = size.Height
+        height = size.Height
     End Sub
 
@@ -34 +34 @@
         x = rc.x
         y = rc.y
-        widht = rc.width
+        width = rc.width
         height = rc.height
     End Sub
@@ -106 +106 @@
 
     Function IsEmpty() As BOOL
-        If Width <= Single_EPSILON Or Height <= Single_EPSILON Then
-            IsEmptyArea = _System_TRUE
-        Else
-            IsEmptyArea = _System_FALSE
+        If Width <= 0 Or Height <= 0 Then
+            IsEmpty = _System_TRUE
+        Else
+            IsEmpty = _System_FALSE
         End If
     End Function
@@ -139 +139 @@
 
     Static Function FromLTRB(l As Single, t As Single, r As Single, b As Single) As RectangleF
-        Dim r As RectangleF(left, top, right - left, bottom - top)
-        return r
+        Dim rect As RectangleF(l, t, r - l, b - t)
+        return rect
     End Function
 
@@ -156 +156 @@
 
     Function Contains(ByRef rc As RectangleF) As BOOL
-        If X <= rc.X && rc.Right <= Right && Y <= rc.Y && rc.Bottom <= Bottom Then
+        If X <= rc.X And rc.Right <= Right And Y <= rc.Y And rc.Bottom <= Bottom Then
             ContainsRCF = _System_TRUE
         Else
@@ -166 +166 @@
         X -= dx
         Y -= dy
-        Width = dx + dx
-        Height = dy + dy
+        Width += dx + dx
+        Height += dy + dy
     End Sub
 
     Sub Inflate(sz As SizeF)
         Inflate(sz.Width, sz.Height)
-    End Sub
-
-    Sub Inflate(pt As PointF)
-        Inflate(pt.X, pt.Y)
     End Sub
 
@@ -183 +179 @@
     End Function
 
-    Function Intersect(ByRef rect As RectangleF) As BOOL
-        Intersect = Intersect(This, This, rect)
-    End Function
-
+    Sub Intersect(ByRef rect As RectangleF)
+        This = RectangleF.Intersect(This, rect)
+    End Sub
+    
     Static Function Intersect(ByRef a As RectangleF, ByRef b As RectangleF) As RectangleF
         Dim right As Single, bottom As Single, left As Single, top As Single
@@ -209 +205 @@
     Static Function Union(ByRef a As RectangleF, ByRef b As RectangleF) As RectangleF
         Dim right As Single, bottom As Single, left As Single, top As Single
-        right = Math.Max(a.GetRight(), b.GetRight())
-        bottom = Math.Max(a.GetBottom(), b.GetBottom())
-        left = Math.Max(a.GetLeft(), b.GetLeft())
-        top = Math.Max(a.GetTop(), b.GetTop())
+        right = Math.Max(a.Right(), b.Right())
+        bottom = Math.Max(a.Bottom(), b.Bottom())
+        left = Math.Max(a.Left(), b.Left())
+        top = Math.Max(a.Top(), b.Top())
         Return FromLTRB(left, top, right, bottom)
     End Function