v0.0.460

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.456"
+const GoextVersion = "0.0.460"
 
-const GoextVersionTimestamp = "2024-05-18T23:38:47+0200"
+const GoextVersionTimestamp = "2024-05-20T00:38:04+0200"

imageext/image.go

@@ -234,11 +234,15 @@ func ObjectFitImage(img image.Image, bbw float64, bbh float64, fit ImageFit, fil
 
 		// we scale the bounding box by fac (both dimension the same amount, to keep the bounding-box ratio)
 
+		// [ow|oh] ==> size of output image (same ratio as bounding box [bbw|bbh])
+
 		ow := int(math.Round(bbw * facOut))
 		oh := int(math.Round(bbh * facOut))
 
 		facScale := mathext.Min(float64(ow)/float64(iw), float64(oh)/float64(ih))
 
+		// [dw|dh] ==> size of destination rect (where to draw source in output image) (same ratio as input image [iw|ih])
+
 		dw := int(math.Round(float64(iw) * facScale))
 		dh := int(math.Round(float64(ih) * facScale))
 
@@ -248,11 +252,11 @@ func ObjectFitImage(img image.Image, bbw float64, bbh float64, fit ImageFit, fil
 		if fit == ImageFitContainCenter {
 			destBounds = image.Rect((ow-dw)/2, (oh-dh)/2, (ow-dw)/2+dw, (oh-dh)/2+dh)
 		} else if fit == ImageFitContainTopLeft {
-			destBounds = image.Rect(0, 0, iw, dh)
+			destBounds = image.Rect(0, 0, dw, dh)
 		} else if fit == ImageFitContainTopRight {
-			destBounds = image.Rect(ow-iw, 0, ow, dh)
+			destBounds = image.Rect(ow-dw, 0, ow, dh)
 		} else if fit == ImageFitContainBottomLeft {
-			destBounds = image.Rect(0, oh-dh, iw, oh)
+			destBounds = image.Rect(0, oh-dh, dw, oh)
 		} else if fit == ImageFitContainBottomRight {
 			destBounds = image.Rect(ow-dw, oh-dh, ow, oh)
 		}

wpdf/utils.go

@@ -0,0 +1,9 @@
+package wpdf
+
+func hexToColor(c uint32) PDFColor {
+	return PDFColor{R: int((c >> 16) & 0xFF), G: int((c >> 8) & 0xFF), B: int((c >> 0) & 0xFF)}
+}
+
+func rgbToColor(r, g, b int) PDFColor {
+	return PDFColor{R: r, G: g, B: b}
+}

wpdf/wpdfCell.go

@@ -17,6 +17,9 @@ type PDFCellOpt struct {
 	extraLn           *float64
 	x                 *float64
 	autoWidth         *bool
+	textColor         *PDFColor
+	borderColor       *PDFColor
+	fillColor         *PDFColor
 }
 
 func NewPDFCellOpt() *PDFCellOpt {
@@ -110,6 +113,36 @@ func (opt *PDFCellOpt) AutoWidth() *PDFCellOpt {
 	return opt
 }
 
+func (opt *PDFCellOpt) TextColor(cr, cg, cb int) *PDFCellOpt {
+	opt.textColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return opt
+}
+
+func (opt *PDFCellOpt) TextColorHex(c uint32) *PDFCellOpt {
+	opt.textColor = langext.Ptr(hexToColor(c))
+	return opt
+}
+
+func (opt *PDFCellOpt) BorderColor(cr, cg, cb int) *PDFCellOpt {
+	opt.borderColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return opt
+}
+
+func (opt *PDFCellOpt) BorderColorHex(c uint32) *PDFCellOpt {
+	opt.borderColor = langext.Ptr(hexToColor(c))
+	return opt
+}
+
+func (opt *PDFCellOpt) FillColor(cr, cg, cb int) *PDFCellOpt {
+	opt.fillColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return opt
+}
+
+func (opt *PDFCellOpt) FillColorHex(c uint32) *PDFCellOpt {
+	opt.fillColor = langext.Ptr(hexToColor(c))
+	return opt
+}
+
 func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 
 	txtTR := b.tr(txt)
@@ -128,6 +161,9 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 	extraLn := float64(0)
 	var x *float64
 	autoWidth := false
+	var textColor *PDFColor
+	var borderColor *PDFColor
+	var fillColor *PDFColor
 
 	for _, opt := range opts {
 		width = langext.Coalesce(opt.width, width)
@@ -144,6 +180,9 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 		extraLn = langext.Coalesce(opt.extraLn, extraLn)
 		x = langext.CoalesceOpt(opt.x, x)
 		autoWidth = langext.Coalesce(opt.autoWidth, autoWidth)
+		textColor = langext.CoalesceOpt(opt.textColor, textColor)
+		borderColor = langext.CoalesceOpt(opt.borderColor, borderColor)
+		fillColor = langext.CoalesceOpt(opt.fillColor, fillColor)
 	}
 
 	if fontNameOverride != nil || fontStyleOverride != nil || fontSizeOverride != nil {
@@ -157,6 +196,24 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 		defer func() { b.SetFont(oldFontName, oldFontStyle, oldFontSize) }()
 	}
 
+	if textColor != nil {
+		oldColorR, oldColorG, oldColorB := b.b.GetTextColor()
+		b.SetTextColor(textColor.R, textColor.G, textColor.B)
+		defer func() { b.SetTextColor(oldColorR, oldColorG, oldColorB) }()
+	}
+
+	if borderColor != nil {
+		oldColorR, oldColorG, oldColorB := b.b.GetDrawColor()
+		b.SetDrawColor(borderColor.R, borderColor.G, borderColor.B)
+		defer func() { b.SetDrawColor(oldColorR, oldColorG, oldColorB) }()
+	}
+
+	if fillColor != nil {
+		oldColorR, oldColorG, oldColorB := b.b.GetFillColor()
+		b.SetFillColor(fillColor.R, fillColor.G, fillColor.B)
+		defer func() { b.SetFillColor(oldColorR, oldColorG, oldColorB) }()
+	}
+
 	if x != nil {
 		b.b.SetX(*x)
 	}

wpdf/wpdfMultiCell.go

@@ -13,6 +13,9 @@ type PDFMultiCellOpt struct {
 	fontSizeOverride  *float64
 	extraLn           *float64
 	x                 *float64
+	textColor         *PDFColor
+	borderColor       *PDFColor
+	fillColor         *PDFColor
 }
 
 func NewPDFMultiCellOpt() *PDFMultiCellOpt {
@@ -86,6 +89,36 @@ func (opt *PDFMultiCellOpt) X(v float64) *PDFMultiCellOpt {
 	return opt
 }
 
+func (opt *PDFMultiCellOpt) TextColor(cr, cg, cb int) *PDFMultiCellOpt {
+	opt.textColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return opt
+}
+
+func (opt *PDFMultiCellOpt) TextColorHex(c uint32) *PDFMultiCellOpt {
+	opt.textColor = langext.Ptr(hexToColor(c))
+	return opt
+}
+
+func (opt *PDFMultiCellOpt) BorderColor(cr, cg, cb int) *PDFMultiCellOpt {
+	opt.borderColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return opt
+}
+
+func (opt *PDFMultiCellOpt) BorderColorHex(c uint32) *PDFMultiCellOpt {
+	opt.borderColor = langext.Ptr(hexToColor(c))
+	return opt
+}
+
+func (opt *PDFMultiCellOpt) FillColor(cr, cg, cb int) *PDFMultiCellOpt {
+	opt.fillColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return opt
+}
+
+func (opt *PDFMultiCellOpt) FillColorHex(c uint32) *PDFMultiCellOpt {
+	opt.fillColor = langext.Ptr(hexToColor(c))
+	return opt
+}
+
 func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
 
 	txtTR := b.tr(txt)
@@ -100,6 +133,9 @@ func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
 	var fontSizeOverride *float64
 	extraLn := float64(0)
 	var x *float64
+	var textColor *PDFColor
+	var borderColor *PDFColor
+	var fillColor *PDFColor
 
 	for _, opt := range opts {
 		width = langext.Coalesce(opt.width, width)
@@ -112,6 +148,9 @@ func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
 		fontSizeOverride = langext.CoalesceOpt(opt.fontSizeOverride, fontSizeOverride)
 		extraLn = langext.Coalesce(opt.extraLn, extraLn)
 		x = langext.CoalesceOpt(opt.x, x)
+		textColor = langext.CoalesceOpt(opt.textColor, textColor)
+		borderColor = langext.CoalesceOpt(opt.borderColor, borderColor)
+		fillColor = langext.CoalesceOpt(opt.fillColor, fillColor)
 	}
 
 	if fontNameOverride != nil || fontStyleOverride != nil || fontSizeOverride != nil {
@@ -125,6 +164,24 @@ func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
 		defer func() { b.SetFont(oldFontName, oldFontStyle, oldFontSize) }()
 	}
 
+	if textColor != nil {
+		oldColorR, oldColorG, oldColorB := b.b.GetTextColor()
+		b.SetTextColor(textColor.R, textColor.G, textColor.B)
+		defer func() { b.SetTextColor(oldColorR, oldColorG, oldColorB) }()
+	}
+
+	if borderColor != nil {
+		oldColorR, oldColorG, oldColorB := b.b.GetDrawColor()
+		b.SetDrawColor(borderColor.R, borderColor.G, borderColor.B)
+		defer func() { b.SetDrawColor(oldColorR, oldColorG, oldColorB) }()
+	}
+
+	if fillColor != nil {
+		oldColorR, oldColorG, oldColorB := b.b.GetFillColor()
+		b.SetFillColor(fillColor.R, fillColor.G, fillColor.B)
+		defer func() { b.SetFillColor(oldColorR, oldColorG, oldColorB) }()
+	}
+
 	if x != nil {
 		b.b.SetX(*x)
 	}

wpdf/wpdfRect.go

@@ -34,22 +34,22 @@ func (opt *PDFRectOpt) LineWidth(v float64) *PDFRectOpt {
 }
 
 func (opt *PDFRectOpt) DrawColor(cr, cg, cb int) *PDFRectOpt {
-	opt.drawColor = &PDFColor{R: cr, G: cg, B: cb}
+	opt.drawColor = langext.Ptr(rgbToColor(cr, cg, cb))
 	return opt
 }
 
 func (opt *PDFRectOpt) DrawColorHex(c uint32) *PDFRectOpt {
-	opt.drawColor = &PDFColor{R: int((c >> 16) & 0xFF), G: int((c >> 8) & 0xFF), B: int((c >> 0) & 0xFF)}
+	opt.drawColor = langext.Ptr(hexToColor(c))
 	return opt
 }
 
 func (opt *PDFRectOpt) FillColor(cr, cg, cb int) *PDFRectOpt {
-	opt.fillColor = &PDFColor{R: cr, G: cg, B: cb}
+	opt.fillColor = langext.Ptr(rgbToColor(cr, cg, cb))
 	return opt
 }
 
 func (opt *PDFRectOpt) FillColorHex(c uint32) *PDFRectOpt {
-	opt.fillColor = &PDFColor{R: int((c >> 16) & 0xFF), G: int((c >> 8) & 0xFF), B: int((c >> 0) & 0xFF)}
+	opt.fillColor = langext.Ptr(hexToColor(c))
 	return opt
 }