diff --git a/comp/src/gb.report/.src/ReportContainer.class b/comp/src/gb.report/.src/ReportContainer.class index f83e952b5..6ee882920 100644 --- a/comp/src/gb.report/.src/ReportContainer.class +++ b/comp/src/gb.report/.src/ReportContainer.class @@ -278,7 +278,7 @@ Public Sub _GetSizeHints(AvailableW As Float, AvailableH As Float, TotalWidth As Case Arrange.Horizontal Return GetHSizeInt(AvailableW, AvailableH, TotalWidth, TotalHeight) Case Arrange.Column - Return GetCSizeInt(AvailableW, AvailableH, TotalWidth, TotalHeight) + Return GetVSizeInt(AvailableW, AvailableH, TotalWidth, TotalHeight) Case Arrange.Fill, Arrange.None Return Super._GetSizeHints(AvailableW, AvailableH, TotalWidth, TotalHeight) 'hMyHints.Height = AvailableH @@ -388,27 +388,6 @@ Private Function GetVSizeInt(AvailableW As Float, AvailableH As Float, TotalWidt 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 If $bDataIsResult Then diff --git a/comp/src/gb.report/.src/Tests/Report8.report b/comp/src/gb.report/.src/Tests/Report8.report index f5156e92e..25d8028a9 100644 --- a/comp/src/gb.report/.src/Tests/Report8.report +++ b/comp/src/gb.report/.src/Tests/Report8.report @@ -7,7 +7,7 @@ { ReportPanel1 ReportVPanel #MoveScaled(3,6,64,49) Padding = ReportPadding["Top:4mm;Bottom:4mm;Left:4mm;Right:4mm"] - Expand = True + AutoResize = True Spacing = "7mm" { ReportHBox1 ReportHBox #MoveScaled(0,0,64,8)