diff --git a/comp/src/gb.report/.info b/comp/src/gb.report/.info index ea05c7664..d7430e9e2 100644 --- a/comp/src/gb.report/.info +++ b/comp/src/gb.report/.info @@ -432,6 +432,18 @@ _PaintBrush m PaintBrush (X1)i(Y1)i(X2)i(Y2)i +Color +m +ReportBrush +(iColor)i +LinearGradient +m +ReportBrush +(X)f(Y)f(X2)f(Y2)f(aColor)Integer[];(aPos)Float[]; +RadialGradient +m +ReportBrush +(X)f(Y)f(Radius)f(X2)f(Y2)f(aColor)Integer[];(aPos)Float[]; _get M ReportBrush @@ -440,6 +452,10 @@ ToString m s +ImageBrush +m +ReportBrush +(hImage)Image; #ReportContainer ReportFrame diff --git a/comp/src/gb.report/.project b/comp/src/gb.report/.project index f761e31b4..c4458fcfc 100644 --- a/comp/src/gb.report/.project +++ b/comp/src/gb.report/.project @@ -1,9 +1,9 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.4.0 +# Compiled with Gambas 3.4.90 Title=Report designer -Startup=Report9 +Startup=myReport1 Icon=printer1.png -Version=3.4.0 +Version=3.4.90 VersionFile=1 Component=gb.image Component=gb.gui diff --git a/comp/src/gb.report/.src/ReportBrush.class b/comp/src/gb.report/.src/ReportBrush.class index 86a088507..ce0d9a1e9 100644 --- a/comp/src/gb.report/.src/ReportBrush.class +++ b/comp/src/gb.report/.src/ReportBrush.class @@ -175,3 +175,47 @@ Public Function ToString() As String End +Public Function Color(iColor As Integer) As ReportBrush + + Dim hBrush As New ReportBrush + + hBrush._Color[0] = Hex(iColor) + hBrush._Type = 0 + +End + +Public Function LinearGradient(X As Float, Y As Float, X2 As Float, Y2 As Float, aColor As Integer[], aPos As Float[]) As ReportBrush + Dim hBrush As New ReportBrush + + hBrush._X = X + hBrush._Y = Y + hBrush._X2 = X2 + hBrush._Y2 = Y2 + hBrush._Color = aColor + hBrush._Pos = aPos + hBrush._Type = 2 + Return hBrush +End + +Public Function RadialGradient(X As Float, Y As Float, Radius As Float, X2 As Float, Y2 As Float, aColor As Integer[], aPos As Float[]) As ReportBrush + Dim hBrush As New ReportBrush + + hBrush._X = X + hBrush._Y = Y + hBrush._X2 = X2 + hBrush._Y2 = Y2 + hBrush._radius = Radius + hBrush._Color = aColor + hBrush._Pos = aPos + hBrush._Type = 3 + Return hBrush +End + +Public Function ImageBrush(hImage As Image) As ReportBrush + Dim hBrush As New ReportBrush + + hBrush._Image = hImage + hBrush._Type = 1 + Return hBrush + +End