Changeset 77 for Include/Classes/System/Drawing

Timestamp:

Jan 27, 2007, 12:04:09 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

Controlの追加とそれに伴う修正

Location:

Include/Classes/System/Drawing

Files:

• Color.ab (modified) (2 diffs)
• Drawing2D (added)
• Drawing2D/Matrix.ab (added)
• Drawing2D/misc.ab (added)
• Imaging/misc.ab (modified) (1 diff)
• PointF.ab (modified) (1 diff)
• Rectangle.ab (modified) (10 diffs)
• Text (added)
• Text/misc.ab (added)
• index.ab (added)

Include/Classes/System/Drawing/Color.ab

@@ -50 +50 @@
 
     Function A() As Byte
-        Return (Argb >> Color_AlphaShift) As Byte
+        Return (argb >> ALPHA_SHIFT) As Byte
     End Function
 
     Function R() As Byte
-        Return (Argb >> Color_RedShift) As Byte
+        Return (argb >> RED_SHIFT) As Byte
     End Function
 
     Function G() As Byte
-        Return (Argb >> Color_GreenShift) As Byte
+        Return (argb >> GREEN_SHIFT) As Byte
     End Function
 
     Function B() As Byte
-        GetBlue = (argb >> Color_BlueShift) As Byte
+        Return (argb >> BLUE_SHIFT) As Byte
     End Function
 
@@ -306 +306 @@
 */
     Static Function MakeARGB(a As Byte, r As Byte, g As Byte, b As Byte) As ARGB
-        MakeARGB = (((b As ARGB) <<  Color_BlueShift) Or _
-                    ((g As ARGB) << Color_GreenShift) Or _
-                    ((r As ARGB) <<   Color_RedShift) Or _
-                    ((a As ARGB) << Color_AlphaShift))
+        MakeARGB = (((b As ARGB) <<  BLUE_SHIFT) Or _
+                    ((g As ARGB) << GREEN_SHIFT) Or _
+                    ((r As ARGB) <<   RED_SHIFT) Or _
+                    ((a As ARGB) << ALPHA_SHIFT))
     End Function
 

Include/Classes/System/Drawing/Imaging/misc.ab

@@ -14 +14 @@
 End Enum
 
-Const ALPHA_SHIFT = 24
-Const RED_SHIFT   = 16
-Const GREEN_SHIFT = 8
-Const BLUE_SHIFT  = 0
+Const ALPHA_SHIFT = 24 As DWord
+Const RED_SHIFT   = 16 As DWord
+Const GREEN_SHIFT = 8 As DWord
+Const BLUE_SHIFT  = 0 As DWord
 Const ALPHA_MASK  = ((&hff As ARGB) << ALPHA_SHIFT)
 

Include/Classes/System/Drawing/PointF.ab

@@ -110 +110 @@
     End Function
 
-    Static Function Substract((pt1 As PointF, pt2 As PointF) As PointF
+    Static Function Substract(pt1 As PointF, pt2 As PointF) As PointF
         Dim ret As PointF(pt1.x - pt2.x, pt1.y - pt2.y)
         Return ret

Include/Classes/System/Drawing/Rectangle.ab

@@ -18 +18 @@
     End Sub
 
-    Sub Rectangle(x As Single, y As Single, width As Single, height As Single)
+    Sub Rectangle(x As Long, y As Long, width As Long, height As Long)
         x = x
         y = y
@@ -25 +25 @@
     End Sub
 
-    Sub Rectangle(location As Point, size As Size)
-        x = location.X
-        y = location.Y
-        width = size.Height
-        height = size.Height
-    End Sub
-
-    Sub Rectangle(ByRef rc As Rectangle)
-        x = rc.x
-        y = rc.y
-        width = rc.width
-        height = rc.height
+    Sub Rectangle(l As Point, s As Size)
+        x = l.X
+        y = l.Y
+        width = s.Height
+        height = s.Height
+    End Sub
+
+    Sub Rectangle(ByRef r As Rectangle)
+        x = r.x
+        y = r.y
+        width = r.width
+        height = r.height
+    End Sub
+
+    Sub Rectangle(ByRef r As RECT)
+        This = FromLTRB(r.left, r.top, r.right, r.bottom)
     End Sub
 
@@ -58 +62 @@
     End Sub
 
-    Function X() As Single
+    Function X() As Long
         Return x
     End Function
 
-    Sub X(value As Single)
+    Sub X(value As Long)
         x = value
     End Sub
 
-    Function Y() As Single
+    Function Y() As Long
         Return y
     End Function
 
-    Sub Y(value As Single)
+    Sub Y(value As Long)
         y = value
     End Sub
 
-    Function Width() As Single
+    Function Width() As Long
         Return width
     End Function
 
-    Sub Width(value As Single)
+    Sub Width(value As Long)
         width = value
     End Sub
 
-    Function Height() As Single
+    Function Height() As Long
         Return height
     End Function
 
-    Sub Height(value As Single)
+    Sub Height(value As Long)
         height = value
     End Sub
 
-    Function Left() As Single
+    Function Left() As Long
         Return X
     End Function
 
-    Function Top() As Single
+    Function Top() As Long
         Return Y
     End Function
 
-    Function Right() As Single
+    Function Right() As Long
         Return X + Width
     End Function
 
-    Function Bottom() As Single
+    Function Bottom() As Long
         Return Y + Height
     End Function
@@ -144 +148 @@
     End Function
 
-    Static Function FromLTRB(l As Single, t As Single, r As Single, b As Single) As Rectangle
+    Static Function FromLTRB(l As Long, t As Long, r As Long, b As Long) As Rectangle
         Dim rect As Rectangle(l, t, r - l, r - b)
         return rect
     End Function
 
-    Function Contains(x As Single, y As Single) As BOOL
+    Function Contains(x As Long, y As Long) As BOOL
         If x >= X And x < X + Width And y >= Y And y < Y + Height Then
             Contains = _System_TRUE
@@ -169 +173 @@
     End Function
 
-    Sub Inflate(dx As Single, dy As Single)
+    Sub Inflate(dx As Long, dy As Long)
         X -= dx
         Y -= dy
@@ -180 +184 @@
     End Sub
 
-    Static Function Inflate(ByRef rc As Rectangle, x As Single, y As Single) As Rectangle
+    Static Function Inflate(ByRef rc As Rectangle, x As Long, y As Long) As Rectangle
         Inflate = rc
         Inflate.Inflate(x, y)
@@ -190 +194 @@
 
     Static Function Intersect(ByRef a As Rectangle, ByRef b As Rectangle) As Rectangle
-        Dim right As Single, bottom As Single, left As Single, top As Single
+        Dim right As Long, bottom As Long, left As Long, top As Long
         right = Math.Min(a.Right, b.Right)
         bottom = Math.Min(a.Bottom, b.Bottom)
@@ -210 +214 @@
 
     Static Function Union(ByRef a As Rectangle, ByRef b As Rectangle) As Rectangle
-        Dim right As Single, bottom As Single, left As Single, top As Single
+        Dim right As Long, bottom As Long, left As Long, top As Long
         right = Math.Max(a.Right(), b.Right())
         bottom = Math.Max(a.Bottom(), b.Bottom())
@@ -222 +226 @@
     End Sub
 
-    Sub Offset(dx As Single, dy As Single)
+    Sub Offset(dx As Long, dy As Long)
         X += dx
         Y += dy
@@ -254 +258 @@
     End Function
 
+    Function ToRECT() As RECT
+        With ToRECT
+            .left = x
+            .top = y
+            .right = x + width
+            .bottom = y + height
+        End With
+    End Function
+
 Public
-    x As Single
-    y As Single
-    width As Single
-    height As Single
+    x As Long
+    y As Long
+    width As Long
+    height As Long
 End Class