let fill color define text color for pdf and implement SetLineJoin
This commit is contained in:
parent
71c1aba4fe
commit
f6e57f4712
1 changed files with 14 additions and 2 deletions
|
@ -31,6 +31,11 @@ var (
|
||||||
draw2d.RoundCap: "round",
|
draw2d.RoundCap: "round",
|
||||||
draw2d.ButtCap: "butt",
|
draw2d.ButtCap: "butt",
|
||||||
draw2d.SquareCap: "square"}
|
draw2d.SquareCap: "square"}
|
||||||
|
joins = map[draw2d.Join]string{
|
||||||
|
draw2d.RoundJoin: "round",
|
||||||
|
draw2d.BevelJoin: "bevel",
|
||||||
|
draw2d.MiterJoin: "miter",
|
||||||
|
}
|
||||||
imageCount uint32
|
imageCount uint32
|
||||||
white color.Color = color.RGBA{255, 255, 255, 255}
|
white color.Color = color.RGBA{255, 255, 255, 255}
|
||||||
)
|
)
|
||||||
|
@ -199,10 +204,11 @@ func (gc *GraphicContext) SetStrokeColor(c color.Color) {
|
||||||
gc.pdf.SetDrawColor(rgb(c))
|
gc.pdf.SetDrawColor(rgb(c))
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetFillColor sets the fill color
|
// SetFillColor sets the fill and text color
|
||||||
func (gc *GraphicContext) SetFillColor(c color.Color) {
|
func (gc *GraphicContext) SetFillColor(c color.Color) {
|
||||||
gc.StackGraphicContext.SetFillColor(c)
|
gc.StackGraphicContext.SetFillColor(c)
|
||||||
gc.pdf.SetFillColor(rgb(c))
|
gc.pdf.SetFillColor(rgb(c))
|
||||||
|
gc.pdf.SetTextColor(rgb(c))
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetFont is unsupported by the pdf graphic context, use SetFontData
|
// SetFont is unsupported by the pdf graphic context, use SetFontData
|
||||||
|
@ -256,6 +262,12 @@ func (gc *GraphicContext) SetLineCap(Cap draw2d.Cap) {
|
||||||
gc.pdf.SetLineCapStyle(caps[Cap])
|
gc.pdf.SetLineCapStyle(caps[Cap])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetLineJoin sets the line cap (round, bevel or miter)
|
||||||
|
func (gc *GraphicContext) SetLineJoin(Join draw2d.Join) {
|
||||||
|
gc.StackGraphicContext.SetLineJoin(Join)
|
||||||
|
gc.pdf.SetLineJoinStyle(joins[Join])
|
||||||
|
}
|
||||||
|
|
||||||
// Transformations
|
// Transformations
|
||||||
|
|
||||||
// Scale generally scales the following text, drawings and images.
|
// Scale generally scales the following text, drawings and images.
|
||||||
|
@ -307,7 +319,7 @@ func (gc *GraphicContext) Restore() {
|
||||||
gc.SetFillRule(c.FillRule)
|
gc.SetFillRule(c.FillRule)
|
||||||
// gc.SetLineDash(c.Dash, c.DashOffset) // TODO
|
// gc.SetLineDash(c.Dash, c.DashOffset) // TODO
|
||||||
gc.SetLineCap(c.Cap)
|
gc.SetLineCap(c.Cap)
|
||||||
// gc.SetLineJoin(c.Join) // TODO
|
gc.SetLineJoin(c.Join)
|
||||||
// c.Path unsupported
|
// c.Path unsupported
|
||||||
// c.Font unsupported
|
// c.Font unsupported
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue