[GB.REPORT]

BUG: Now Duplex modes are correctly setting in ReportPreview
BUG: ReportFrame set clipping inside the borders



git-svn-id: svn://localhost/gambas/trunk@6152 867c0c6c-44f3-4631-809d-bfa615b0a4ec

comp/src/gb.report/.project

@@ -1,7 +1,7 @@
 # Gambas Project File 3.0
 # Compiled with Gambas 3.5.90
 Title=Report designer
-Startup=myReport1
+Startup=rpTestShadow
 Icon=printer1.png
 Version=3.5.90
 VersionFile=1
@@ -15,7 +15,6 @@ Component=gb.map
 Component=gb.report
 Description="Report engine for gambas"
 Authors="Fabien Bodard"
-Environment="GB_GUI=gb.gtk3"
 TabSize=2
 Translate=1
 Language=fr

comp/src/gb.report/.src/Preview/FPreview.form

@@ -184,7 +184,7 @@
           { cmbDuplex ComboBox
             MoveScaled(15,0,21,4)
             ReadOnly = True
-            List = [("None"), ("Long side"), ("Short side")]
+            List = [("None"), ("Short side"), ("Long side")]
           }
         }
         { HBox3 HBox

comp/src/gb.report/.src/ReportBoxShadow.class

@@ -2,8 +2,8 @@
 
 Private $aBoxShadow As New _ReportBoxShadow[]
 
-Property RelX As String
-Property RelY As String
+Property XOffset As String
+Property YOffset As String
 'Property Blur As String
 Property Spread As String
 Property Inset As Boolean
@@ -12,8 +12,8 @@ Property Read Count As Integer
 Property Read Max As Integer
 
 
-Property Read _RelX As Integer
-Property Read _RelY As Integer
+Property Read _XOffset As Integer
+Property Read _YOffset As Integer
 'Property Read _Blur As Integer
 Property Read _Spread As Integer
 
@@ -35,9 +35,9 @@ Static Public Function _get(sValue As String) As ReportBoxShadow
       
       Select Case i
         Case 0
-          hBoxShadow.RelX = s
+          hBoxShadow.XOffset = s
         Case 1
-          hBoxShadow.RelY = s
+          hBoxShadow.YOffset = s
         Case 2
           hBoxShadow.Blur = s
         Case 3
@@ -65,12 +65,12 @@ End
 '   
 ' End
 
-Public Sub Add(Optional RelX As String, RelY As String, iColor As Integer, Spread As String, Blur As String, Inset As Boolean)
+Public Sub Add(Optional XOffset As String, YOffset As String, iColor As Integer, Spread As String, Blur As String, Inset As Boolean)
   
   Dim hBoxShadow As New _ReportBoxShadow
   
-  If RelX Then hBoxShadow.RelX = RelX
-  If RelY Then hBoxShadow.RelY = RelY
+  If XOffset Then hBoxShadow.XOffset = XOffset
+  If YOffset Then hBoxShadow.YOffset = YOffset
   If iColor Then hBoxShadow.Color = iColor
   If SPread Then hBoxShadow.Spread = Spread
   If Blur Then hBoxShadow.Blur = Blur
@@ -87,27 +87,27 @@ End
 
 
 
-Private Function RelX_Read() As String
+Private Function XOffset_Read() As String
 
-  Return $aBoxShadow[0].RelX
+  Return $aBoxShadow[0].XOffset
 
 End
 
-Private Sub RelX_Write(Value As String)
+Private Sub XOffset_Write(Value As String)
 
-  $aBoxShadow[0].RelX = Value
+  $aBoxShadow[0].XOffset = Value
 
 End
 
-Private Function RelY_Read() As String
+Private Function YOffset_Read() As String
 
-  Return $aBoxShadow[0].RelY
+  Return $aBoxShadow[0].YOffset
 
 End
 
-Private Sub RelY_Write(Value As String)
+Private Sub YOffset_Write(Value As String)
 
-  $aBoxShadow[0].RelY = Value
+  $aBoxShadow[0].YOffset = Value
 
 End
 
@@ -177,8 +177,8 @@ Public Sub _SetUnifiedValues()
   Dim SizeParse As TSizeParse
   For i = 0 To $aBoxShadow.Max
     With $aBoxShadow[i]
-      ._Relx = TSizeParse[.RelX].GetValue()
-      ._RelY = TSizeParse[.RelY].GetValue()
+      ._XOffset = TSizeParse[.XOffset].GetValue()
+      ._YOffset = TSizeParse[.YOffset].GetValue()
       ._Spread = TSizeParse[.Spread].GetValue()
       '._Blur = TSizeParse[.Blur].GetValue()
     End With
@@ -188,15 +188,15 @@ Public Sub _SetUnifiedValues()
   
 End
 
-Private Function _RelX_Read() As Integer
+Private Function _XOffset_Read() As Integer
 
-  Return $aBoxShadow[0]._Relx
+  Return $aBoxShadow[0]._XOffset
 
 End
 
-Private Function _RelY_Read() As Integer
+Private Function _YOffset_Read() As Integer
 
-  Return $aBoxShadow[0]._RelY
+  Return $aBoxShadow[0]._YOffset
 
 End
 

comp/src/gb.report/.src/ReportFrame.class

@@ -37,7 +37,7 @@ End
 Public Sub _PaintBefore((Page) As Integer, (X) As Float, (Y) As Float, (hControl) As TControl, (DataIndex) As Integer)
 
   Dim X1, Y1, X2, Y2 As Float
- 
+ Dim iBorder As Integer
 
   'If Me.tag = "*" Then Stop
 
@@ -63,8 +63,9 @@ Public Sub _PaintBefore((Page) As Integer, (X) As Float, (Y) As Float, (hControl
   Else
     'If $hBorder.Shadow.Style > ReportShadowStyle.None Then PaintShadow(X1, Y1, hControl.RealWidth, hControl.RealHeight, $hBorder.RoundCorner._Active)
     If $hBorder.RoundCorner._Active Then
-
-        RoundRect(X1, Y1, hControl.RealWidth, hControl.RealHeight,
+        iBorder = ReportUnits._ReportUnitsToPixels($hBorder._Top)
+        
+        RoundRect(X1 + iBorder, Y1 + iBorder, hControl.RealWidth - iBorder * 2, hControl.RealHeight - iBorder * 2,
         [ReportUnits._ReportUnitsToPixels($hBorder.RoundCorner._TopLeft1),
         ReportUnits._ReportUnitsToPixels($hBorder.RoundCorner._TopRight1),
         ReportUnits._ReportUnitsToPixels($hBorder.RoundCorner._BottomRight1),
@@ -75,7 +76,7 @@ Public Sub _PaintBefore((Page) As Integer, (X) As Float, (Y) As Float, (hControl
         ReportUnits._ReportUnitsToPixels($hBorder.RoundCorner._BottomRight2)])
 
     Else
-        If $hBoxShadow._RelX <> 0 Then
+        If $hBoxShadow._XOffset <> 0 Then
           
         Endif
         Paint.Rectangle(X1, Y1, X2 - X1, Y2 - Y1)

comp/src/gb.report/.src/Tests/Report11.report

@@ -17,10 +17,10 @@
     #MoveScaled(6,12,53,31)
     AutoResize = True
     { ReportDrawingArea1 ReportDrawingArea
-      #MoveScaled(2,0,52,30)
+      #MoveScaled(3,4,52,30)
       Width = "7mm"
       Height = "6cm"
-      Border = ReportBorder["Top:2mm LinearGradient(0.84,0.67,0,0,[#000000,#FFFFFF],[0,1]);Bottom:2mm LinearGradient(0.84,0.67,0,0,[#000000,#FFFFFF],[0,1]);Left:2mm LinearGradient(0.84,0.67,0,0,[#000000,#FFFFFF],[0,1]);Right:2mm LinearGradient(0.84,0.67,0,0,[#000000,#FFFFFF],[0,1])"]
+      Border = ReportBorder["Top:2mm #000000;Bottom:2mm #000000;Left:2mm #000000;Right:2mm #000000;TopLeftCorner:2cm;TopRightCorner:2cm;BottomRightCorner:2cm;BottomLeftCorner:2cm"]
       Cached = True
     }
   }

comp/src/gb.report/.src/Tests/rpTestShadow.report

@@ -2,15 +2,18 @@
 
 { Report Report
   #MoveScaled(0,0,64,64)
+  Font = Font["+9"]
   Padding = ReportPadding["Top:6cm;Bottom:6cm;Left:6cm;Right:6cm"]
   Index = 0
   Text = ("")
   { ReportLabel1 ReportLabel
-    #MoveScaled(2,2,58,9)
+    #MoveScaled(3,2,58,9)
     Height = "7cm"
+    Font = Font["Georgia,+12"]
     AutoResize = True
-    Border = ReportBorder["Top:2px #000000;Bottom:2px #000000;Left:2mm LinearGradient(0.74,0.7,0,0,[#000000,#FFFFFF],[0,1]);Right:2px #000000"]
+    Border = ReportBorder["Top:1mm #000000;Bottom:1mm #000000;Left:1mm #000000;Right:1mm #000000"]
     Text = ("coucou")
+    Alignment = Align.Center
   }
   Index = 0
 }

comp/src/gb.report/.src/_ReportBoxShadow.class

@@ -1,13 +1,13 @@
 ' Gambas class file
 
-Public RelX As String = "2mm"
-Public RelY As String = "2mm"
+Public XOffset As String = "2mm"
+Public YOffset As String = "2mm"
 Public Spread As String
 Public Inset As Boolean
 Public Color As Integer
 'Public Blur As String
 
-Public _Relx As Integer
-Public _RelY As Integer
+Public _XOffset As Integer
+Public _YOffset As Integer
 Public _Spread As Integer
 'Public _Blur As Integer