Compare commits

...

2 Commits

Author SHA1 Message Date
d0d72167eb v0.0.454
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 1m17s
2024-05-14 15:10:27 +02:00
a55ee1a6ce v0.0.453
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 1m18s
2024-05-14 14:57:10 +02:00
4 changed files with 23 additions and 13 deletions

View File

@@ -1,5 +1,5 @@
package goext
const GoextVersion = "0.0.452"
const GoextVersion = "0.0.454"
const GoextVersionTimestamp = "2024-05-14T12:48:43+0200"
const GoextVersionTimestamp = "2024-05-14T15:10:27+0200"

View File

@@ -6,12 +6,13 @@ import (
)
type WPDFBuilder struct {
b *gofpdf.Fpdf
tr func(string) string
cellHeight float64
fontName PDFFontFamily
fontStyle PDFFontStyle
fontSize float64
b *gofpdf.Fpdf
tr func(string) string
cellHeight float64
cellSpacing float64
fontName PDFFontFamily
fontStyle PDFFontStyle
fontSize float64
}
type PDFMargins struct {
@@ -38,9 +39,10 @@ func NewPDFBuilder(orientation PDFOrientation, size PDFSize, unicode bool) *WPDF
}
b := &WPDFBuilder{
b: fpdfbuilder,
tr: tr,
cellHeight: 5,
b: fpdfbuilder,
tr: tr,
cellHeight: 5,
cellSpacing: 1,
}
b.SetMargins(PDFMargins{Left: 15, Top: 25, Right: 15}) // default values
@@ -49,6 +51,10 @@ func NewPDFBuilder(orientation PDFOrientation, size PDFSize, unicode bool) *WPDF
return b
}
func (b *WPDFBuilder) FPDF() *gofpdf.Fpdf {
return b.b
}
func (b *WPDFBuilder) SetMargins(v PDFMargins) {
b.b.SetMargins(v.Left, v.Top, v.Right)
}
@@ -99,6 +105,10 @@ func (b *WPDFBuilder) SetFont(fontName PDFFontFamily, fontStyle PDFFontStyle, fo
b.cellHeight = b.b.PointConvert(fontSize)
}
func (b *WPDFBuilder) SetCellSpacing(h float64) {
b.cellSpacing = h
}
func (b *WPDFBuilder) Ln(h float64) {
b.b.Ln(h)
}

View File

@@ -115,7 +115,7 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
txtTR := b.tr(txt)
width := float64(0)
height := b.cellHeight
height := b.cellHeight + b.cellSpacing
border := BorderNone
ln := BreakToNextLine
align := AlignLeft

View File

@@ -91,7 +91,7 @@ func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
txtTR := b.tr(txt)
width := float64(0)
height := b.cellHeight
height := b.cellHeight + b.cellSpacing
border := BorderNone
align := AlignLeft
fill := false