BlackForestBytes/goext
21
0
Fork 0
Code Actions

v0.0.497
Some checks failed
Build Docker and Deploy / Run goext test-suite (push) Failing after 2m33s
Details

Browse Source
This commit is contained in:
Mike Schwörer 2024-08-07 17:04:59 +02:00
parent 741611a2e1
commit 7204562879
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
goextVersion.go
View File

@ -1,5 +1,5 @@
package goext package goext
const GoextVersion = "0.0.496" const GoextVersion = "0.0.497"
const GoextVersionTimestamp = "2024-08-07T15:34:06+0200" const GoextVersionTimestamp = "2024-08-07T17:04:59+0200"

21
wpdf/wpdfTable.go
View File

@ -289,23 +289,28 @@ func (b *TableBuilder) calculateColumns() []float64 {
return columnWidths return columnWidths
} }
for i, _ := range columnDef { {
if frColumnWeights[i] != 0 { rmSub := 0.0
w := min(autoWidths[i], (remainingWidth/float64(frColumnWidthCount))*frColumnWeights[i]) for i := range columnDef {
remainingWidth += columnWidths[i] if frColumnWeights[i] != 0 {
columnWidths[i] = w w := min(autoWidths[i], (remainingWidth/float64(frColumnWidthCount))*frColumnWeights[i])
remainingWidth -= w rmSub += w - columnWidths[i]
columnWidths[i] = w
}
} }
remainingWidth -= rmSub
} }
if remainingWidth > 0 { if remainingWidth > 0.01 {
rmSub := 0.0
for i, _ := range columnDef { for i, _ := range columnDef {
if frColumnWeights[i] != 0 { if frColumnWeights[i] != 0 {
addW := (remainingWidth / float64(frColumnWidthCount)) * frColumnWeights[i] addW := (remainingWidth / float64(frColumnWidthCount)) * frColumnWeights[i]
rmSub += addW
columnWidths[i] += addW columnWidths[i] += addW
remainingWidth -= addW
} }
} }
remainingWidth -= rmSub
} }
return columnWidths return columnWidths