Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
c40bdc8e9e
|
|||
7204562879
|
@@ -1,5 +1,5 @@
|
|||||||
package goext
|
package goext
|
||||||
|
|
||||||
const GoextVersion = "0.0.496"
|
const GoextVersion = "0.0.498"
|
||||||
|
|
||||||
const GoextVersionTimestamp = "2024-08-07T15:34:06+0200"
|
const GoextVersionTimestamp = "2024-08-07T17:26:35+0200"
|
||||||
|
@@ -245,6 +245,10 @@ func (b *WPDFBuilder) PageNo() int {
|
|||||||
return b.b.PageNo()
|
return b.b.PageNo()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *WPDFBuilder) Bookmark(txtStr string, level int, y float64) {
|
||||||
|
b.b.Bookmark(b.tr(txtStr), level, y)
|
||||||
|
}
|
||||||
|
|
||||||
func (b *WPDFBuilder) GetStringWidth(str string, opts ...PDFCellOpt) float64 {
|
func (b *WPDFBuilder) GetStringWidth(str string, opts ...PDFCellOpt) float64 {
|
||||||
|
|
||||||
var fontNameOverride *PDFFontFamily
|
var fontNameOverride *PDFFontFamily
|
||||||
|
@@ -289,23 +289,28 @@ func (b *TableBuilder) calculateColumns() []float64 {
|
|||||||
return columnWidths
|
return columnWidths
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, _ := range columnDef {
|
{
|
||||||
|
rmSub := 0.0
|
||||||
|
for i := range columnDef {
|
||||||
if frColumnWeights[i] != 0 {
|
if frColumnWeights[i] != 0 {
|
||||||
w := min(autoWidths[i], (remainingWidth/float64(frColumnWidthCount))*frColumnWeights[i])
|
w := min(autoWidths[i], (remainingWidth/float64(frColumnWidthCount))*frColumnWeights[i])
|
||||||
remainingWidth += columnWidths[i]
|
rmSub += w - columnWidths[i]
|
||||||
columnWidths[i] = w
|
columnWidths[i] = w
|
||||||
remainingWidth -= 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
|
||||||
|
Reference in New Issue
Block a user