crunchy-rocks/draw2d
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleaned up extra FIXMEs

Browse source
This commit is contained in:
redstarcoder 2016-10-15 16:13:58 -04:00
parent 105a963210
commit 475a830567
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
draw2dgl/gc.go
View file

@ -142,7 +142,6 @@ func NewGraphicContext(width, height int) *GraphicContext {
return gc return gc
} }
//FIXME copied from ../draw2dimg
func (gc *GraphicContext) loadCurrentFont() (*truetype.Font, error) { func (gc *GraphicContext) loadCurrentFont() (*truetype.Font, error) {
font := draw2d.GetFont(gc.Current.FontData) font := draw2d.GetFont(gc.Current.FontData)
if font == nil { if font == nil {
@ -156,7 +155,6 @@ func (gc *GraphicContext) loadCurrentFont() (*truetype.Font, error) {
return font, nil return font, nil
} }
//FIXME copied from ../draw2dimg
func (gc *GraphicContext) drawGlyph(glyph truetype.Index, dx, dy float64) error { func (gc *GraphicContext) drawGlyph(glyph truetype.Index, dx, dy float64) error {
if err := gc.glyphBuf.Load(gc.Current.Font, fixed.Int26_6(gc.Current.Scale), glyph, font.HintingNone); err != nil { if err := gc.glyphBuf.Load(gc.Current.Font, fixed.Int26_6(gc.Current.Scale), glyph, font.HintingNone); err != nil {
return err return err
@ -169,7 +167,6 @@ func (gc *GraphicContext) drawGlyph(glyph truetype.Index, dx, dy float64) error
return nil return nil
} }
//FIXME copied from ../draw2dimg
// CreateStringPath creates a path from the string s at x, y, and returns the string width. // CreateStringPath creates a path from the string s at x, y, and returns the string width.
// The text is placed so that the left edge of the em square of the first character of s // The text is placed so that the left edge of the em square of the first character of s
// and the baseline intersect at x, y. The majority of the affected pixels will be // and the baseline intersect at x, y. The majority of the affected pixels will be
@ -206,7 +203,6 @@ func (gc *GraphicContext) FillStringAt(text string, x, y float64) (width float64
return width return width
} }
//FIXME copied from ../draw2dimg
// GetStringBounds returns the approximate pixel bounds of the string s at x, y. // GetStringBounds returns the approximate pixel bounds of the string s at x, y.
// The the left edge of the em square of the first character of s // The the left edge of the em square of the first character of s
// and the baseline intersect at 0, 0 in the returned coordinates. // and the baseline intersect at 0, 0 in the returned coordinates.
@ -256,7 +252,6 @@ func (gc *GraphicContext) StrokeStringAt(text string, x, y float64) (width float
return width return width
} }
//FIXME copied from ../draw2dimg
// recalc recalculates scale and bounds values from the font size, screen // recalc recalculates scale and bounds values from the font size, screen
// resolution and font metrics, and invalidates the glyph cache. // resolution and font metrics, and invalidates the glyph cache.
func (gc *GraphicContext) recalc() { func (gc *GraphicContext) recalc() {

1
draw2dgl/text.go
View file

@ -1,5 +1,4 @@
package draw2dgl package draw2dgl
//Copied from ../draw2dimg
import ( import (
"github.com/golang/freetype/truetype" "github.com/golang/freetype/truetype"