gio backend support

Enable with build tag nucular_gio

_examples/demo/demo.go

@@ -11,14 +11,12 @@ import (
 	"time"
 
 	"github.com/aarzilli/nucular"
+	"github.com/aarzilli/nucular/font"
 	"github.com/aarzilli/nucular/label"
 	"github.com/aarzilli/nucular/rect"
 	nstyle "github.com/aarzilli/nucular/style"
 	"github.com/aarzilli/nucular/style-editor"
-	"github.com/golang/freetype"
-	"github.com/golang/freetype/truetype"
 
-	"golang.org/x/image/font"
 	"golang.org/x/mobile/event/key"
 )
 
@@ -127,11 +125,11 @@ func main() {
 
 	normalFontData, normerr := ioutil.ReadFile("demofont.ttf")
 	if normerr == nil {
-		normalTtfont, normerr := freetype.ParseFont(normalFontData)
+		szf := 12 * scaling
+		face, normerr := font.NewFace(normalFontData, int(szf))
 		if normerr == nil {
 			style := Wnd.Style()
-			szf := 12 * scaling
-			style.Font = truetype.NewFace(normalTtfont, &truetype.Options{Size: float64(int(szf)), Hinting: font.HintingFull, DPI: 72})
+			style.Font = face
 		}
 	}
 

_examples/richtext/main.go

@@ -10,9 +10,7 @@ import (
 	"github.com/aarzilli/nucular/style"
 
 	"github.com/aarzilli/nucular/_examples/richtext/internal/assets"
-	"github.com/golang/freetype"
-	"github.com/golang/freetype/truetype"
-	"golang.org/x/image/font"
+	"github.com/aarzilli/nucular/font"
 )
 
 //go:generate go-bindata -o internal/assets/assets.go -pkg assets DejaVuSans.ttf DejaVuSans-Bold.ttf DejaVuSans-Oblique.ttf
@@ -34,20 +32,15 @@ func main() {
 	wnd.SetStyle(style.FromTheme(style.DarkTheme, 2.0))
 
 	regularData, _ := assets.Asset("DejaVuSans.ttf")
-	ttfRegular, _ := freetype.ParseFont(regularData)
-
 	boldData, _ := assets.Asset("DejaVuSans-Bold.ttf")
-	ttfBold, _ := freetype.ParseFont(boldData)
-
 	italicData, _ := assets.Asset("DejaVuSans-Oblique.ttf")
-	ttfItalic, _ := freetype.ParseFont(italicData)
 
-	proportional = truetype.NewFace(ttfRegular, &truetype.Options{Size: float64(int(float64(12) * wnd.Style().Scaling)), Hinting: font.HintingFull, DPI: 72})
-	header = truetype.NewFace(ttfRegular, &truetype.Options{Size: float64(int(float64(21) * wnd.Style().Scaling)), Hinting: font.HintingFull, DPI: 72})
+	proportional, _ = font.NewFace(regularData, int(float64(12)*wnd.Style().Scaling))
+	header, _ = font.NewFace(regularData, int(float64(21)*wnd.Style().Scaling))
 	monospace = wnd.Style().Font
 
-	bold = truetype.NewFace(ttfBold, &truetype.Options{Size: float64(int(float64(12) * wnd.Style().Scaling)), Hinting: font.HintingFull, DPI: 72})
-	italic = truetype.NewFace(ttfItalic, &truetype.Options{Size: float64(int(float64(12) * wnd.Style().Scaling)), Hinting: font.HintingFull, DPI: 72})
+	bold, _ = font.NewFace(boldData, int(float64(12)*wnd.Style().Scaling))
+	italic, _ = font.NewFace(italicData, int(float64(12)*wnd.Style().Scaling))
 
 	searchEd.Flags = nucular.EditField
 

command/command.go

@@ -4,9 +4,8 @@ import (
 	"image"
 	"image/color"
 
+	"github.com/aarzilli/nucular/font"
 	"github.com/aarzilli/nucular/rect"
-
-	"golang.org/x/image/font"
 )
 
 // CommandBuffer is a list of drawing directives.
@@ -69,10 +68,6 @@ type CircleFilled struct {
 	Color color.RGBA
 }
 
-type Image struct {
-	Img *image.RGBA
-}
-
 type Text struct {
 	Face       font.Face
 	Foreground color.RGBA
@@ -152,18 +147,6 @@ func (b *Buffer) FillTriangle(p0, p1, p2 image.Point, c color.RGBA) {
 	b.Commands = append(b.Commands, cmd)
 }
 
-func (b *Buffer) DrawImage(r rect.Rect, img *image.RGBA) {
-	if !r.Intersect(&b.Clip) {
-		return
-	}
-
-	var cmd Command
-	cmd.Kind = ImageCmd
-	cmd.Rect = r
-	cmd.Image.Img = img
-	b.Commands = append(b.Commands, cmd)
-}
-
 func (b *Buffer) DrawText(r rect.Rect, str string, face font.Face, fg color.RGBA) {
 	if len(str) == 0 || (fg.A == 0) {
 		return

command/command_gio.go

@@ -0,0 +1,26 @@
+// +build nucular_gio
+
+package command
+
+import (
+	"image"
+
+	"gioui.org/op/paint"
+	"github.com/aarzilli/nucular/rect"
+)
+
+type Image struct {
+	Img paint.ImageOp
+}
+
+func (b *Buffer) DrawImage(r rect.Rect, img *image.RGBA) {
+	if !r.Intersect(&b.Clip) {
+		return
+	}
+
+	var cmd Command
+	cmd.Kind = ImageCmd
+	cmd.Rect = r
+	cmd.Image.Img = paint.NewImageOp(img)
+	b.Commands = append(b.Commands, cmd)
+}

command/command_shiny.go

@@ -0,0 +1,24 @@
+// +build !nucular_gio
+
+package command
+
+import (
+	"github.com/aarzilli/nucular/rect"
+	"image"
+)
+
+type Image struct {
+	Img *image.RGBA
+}
+
+func (b *Buffer) DrawImage(r rect.Rect, img *image.RGBA) {
+	if !r.Intersect(&b.Clip) {
+		return
+	}
+
+	var cmd Command
+	cmd.Kind = ImageCmd
+	cmd.Rect = r
+	cmd.Image.Img = img
+	b.Commands = append(b.Commands, cmd)
+}