luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.REPORT]

Browse source 
* BUG: Change the SizeInt for column


git-svn-id: svn://localhost/gambas/trunk@4283 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Fabien Bodard 2011-12-17 20:41:50 +00:00
parent 63e7d518bc
commit 9921f8e114
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
comp/src/gb.report/.src/ReportContainer.class
View file

@ -278,7 +278,7 @@ Public Sub _GetSizeHints(AvailableW As Float, AvailableH As Float, TotalWidth As
Case Arrange.Horizontal Case Arrange.Horizontal
Return GetHSizeInt(AvailableW, AvailableH, TotalWidth, TotalHeight) Return GetHSizeInt(AvailableW, AvailableH, TotalWidth, TotalHeight)
Case Arrange.Column Case Arrange.Column
Return GetCSizeInt(AvailableW, AvailableH, TotalWidth, TotalHeight) Return GetVSizeInt(AvailableW, AvailableH, TotalWidth, TotalHeight)
Case Arrange.Fill, Arrange.None Case Arrange.Fill, Arrange.None
Return Super._GetSizeHints(AvailableW, AvailableH, TotalWidth, TotalHeight) Return Super._GetSizeHints(AvailableW, AvailableH, TotalWidth, TotalHeight)
'hMyHints.Height = AvailableH 'hMyHints.Height = AvailableH
@ -388,27 +388,6 @@ Private Function GetVSizeInt(AvailableW As Float, AvailableH As Float, TotalWidt
End End
Private Function GetCSizeInt(AvailableW As Float, AvailableH As Float, TotalWidth As Float, TotalHeight As Float) As TSizeHint
Dim hSizeInt As New TSizeHint
Dim htmpInts As TSizeHint
Dim hChild As ReportControl ''Enfants
Dim fHeight, fSpacing, fWidth As Float
Dim i, j As Integer
Dim bExitLoop As Boolean
'D'abord utiliser la méthode du controle pour définir la taille
hSizeInt = Super._GetSizeHints(AvailableW, AvailableH, TotalWidth, TotalHeight)
'On ne peut pas dépasser la taille disponible (report sur prochaine page)
hSizeInt.Height = Min(hSizeInt.Height, AvailableH)
Me._SizeInt = hSizeInt
Return hSizeInt
End
Public Function _GetData(sKey As String) As Variant Public Function _GetData(sKey As String) As Variant
If $bDataIsResult Then If $bDataIsResult Then

2
comp/src/gb.report/.src/Tests/Report8.report
View file

@ -7,7 +7,7 @@
{ ReportPanel1 ReportVPanel { ReportPanel1 ReportVPanel
#MoveScaled(3,6,64,49) #MoveScaled(3,6,64,49)
Padding = ReportPadding["Top:4mm;Bottom:4mm;Left:4mm;Right:4mm"] Padding = ReportPadding["Top:4mm;Bottom:4mm;Left:4mm;Right:4mm"]
Expand = True AutoResize = True
Spacing = "7mm" Spacing = "7mm"
{ ReportHBox1 ReportHBox { ReportHBox1 ReportHBox
#MoveScaled(0,0,64,8) #MoveScaled(0,0,64,8)