~eliasnaur/gio

83d23ab507431c8d270567ef4866ff5001adb5fb — Walter Werner SCHNEIDER 6 months ago e383e6d
all: sort and group imports

Signed-off-by: Walter Werner SCHNEIDER <contact@schnwalter.eu>
M app/internal/d3d11/backend_windows.go => app/internal/d3d11/backend_windows.go +2 -1
@@ 9,9 9,10 @@ import (
	"math"
	"unsafe"

	"golang.org/x/sys/windows"

	"gioui.org/gpu/backend"
	gunsafe "gioui.org/internal/unsafe"
	"golang.org/x/sys/windows"
)

const debug = false

M app/internal/window/os_wayland.go => app/internal/window/os_wayland.go +2 -1
@@ 19,6 19,8 @@ import (
	"time"
	"unsafe"

	syscall "golang.org/x/sys/unix"

	"gioui.org/app/internal/xkb"
	"gioui.org/f32"
	"gioui.org/internal/fling"


@@ 27,7 29,6 @@ import (
	"gioui.org/io/pointer"
	"gioui.org/io/system"
	"gioui.org/unit"
	syscall "golang.org/x/sys/unix"
)

// Use wayland-scanner to generate glue code for the xdg-shell and xdg-decoration extensions.

M app/internal/window/os_x11.go => app/internal/window/os_x11.go +2 -1
@@ 42,8 42,9 @@ import (
	"gioui.org/io/system"
	"gioui.org/unit"

	"gioui.org/app/internal/xkb"
	syscall "golang.org/x/sys/unix"

	"gioui.org/app/internal/xkb"
)

type x11Window struct {

M font/gofont/gofont.go => font/gofont/gofont.go +3 -2
@@ 11,8 11,6 @@ import (
	"fmt"
	"sync"

	"gioui.org/font/opentype"
	"gioui.org/text"
	"golang.org/x/image/font/gofont/gobold"
	"golang.org/x/image/font/gofont/gobolditalic"
	"golang.org/x/image/font/gofont/goitalic"


@@ 25,6 23,9 @@ import (
	"golang.org/x/image/font/gofont/goregular"
	"golang.org/x/image/font/gofont/gosmallcaps"
	"golang.org/x/image/font/gofont/gosmallcapsitalic"

	"gioui.org/font/opentype"
	"gioui.org/text"
)

var (

M font/opentype/opentype.go => font/opentype/opentype.go +4 -3
@@ 10,13 10,14 @@ import (
	"unicode"
	"unicode/utf8"

	"golang.org/x/image/font"
	"golang.org/x/image/font/sfnt"
	"golang.org/x/image/math/fixed"

	"gioui.org/f32"
	"gioui.org/op"
	"gioui.org/op/clip"
	"gioui.org/text"
	"golang.org/x/image/font"
	"golang.org/x/image/font/sfnt"
	"golang.org/x/image/math/fixed"
)

// Font implements text.Face. Its methods are safe to use

M font/opentype/opentype_test.go => font/opentype/opentype_test.go +4 -3
@@ 10,13 10,14 @@ import (
	"strings"
	"testing"

	"gioui.org/internal/ops"
	"gioui.org/op"
	"gioui.org/text"
	"golang.org/x/image/font"
	"golang.org/x/image/font/gofont/goregular"
	"golang.org/x/image/font/sfnt"
	"golang.org/x/image/math/fixed"

	"gioui.org/internal/ops"
	"gioui.org/op"
	"gioui.org/text"
)

func TestCollectionAsFace(t *testing.T) {

M internal/d3dcompile/compile_windows.go => internal/d3dcompile/compile_windows.go +1 -2
@@ 4,9 4,8 @@ package d3dcompile

import (
	"fmt"
	"unsafe"

	"syscall"
	"unsafe"

	gunsafe "gioui.org/internal/unsafe"


M internal/rendertest/clip_test.go => internal/rendertest/clip_test.go +2 -1
@@ 5,11 5,12 @@ import (
	"math"
	"testing"

	"golang.org/x/image/colornames"

	"gioui.org/f32"
	"gioui.org/op"
	"gioui.org/op/clip"
	"gioui.org/op/paint"
	"golang.org/x/image/colornames"
)

func TestPaintRect(t *testing.T) {

M internal/rendertest/render_test.go => internal/rendertest/render_test.go +2 -1
@@ 6,12 6,13 @@ import (
	"math"
	"testing"

	"golang.org/x/image/colornames"

	"gioui.org/f32"
	"gioui.org/internal/f32color"
	"gioui.org/op"
	"gioui.org/op/clip"
	"gioui.org/op/paint"
	"golang.org/x/image/colornames"
)

func TestTransformMacro(t *testing.T) {

M internal/rendertest/transform_test.go => internal/rendertest/transform_test.go +2 -1
@@ 5,11 5,12 @@ import (
	"math"
	"testing"

	"golang.org/x/image/colornames"

	"gioui.org/f32"
	"gioui.org/op"
	"gioui.org/op/clip"
	"gioui.org/op/paint"
	"golang.org/x/image/colornames"
)

func TestPaintOffset(t *testing.T) {

M internal/rendertest/util_test.go => internal/rendertest/util_test.go +2 -1
@@ 13,12 13,13 @@ import (
	"strconv"
	"testing"

	"golang.org/x/image/colornames"

	"gioui.org/app/headless"
	"gioui.org/f32"
	"gioui.org/internal/f32color"
	"gioui.org/op"
	"gioui.org/op/paint"
	"golang.org/x/image/colornames"
)

var (

M text/lru.go => text/lru.go +2 -1
@@ 3,8 3,9 @@
package text

import (
	"gioui.org/op"
	"golang.org/x/image/math/fixed"

	"gioui.org/op"
)

type layoutCache struct {

M text/shaper.go => text/shaper.go +2 -1
@@ 6,8 6,9 @@ import (
	"io"
	"strings"

	"gioui.org/op"
	"golang.org/x/image/math/fixed"

	"gioui.org/op"
)

// Shaper implements layout and shaping of text.

M text/text.go => text/text.go +2 -1
@@ 5,8 5,9 @@ package text
import (
	"io"

	"gioui.org/op"
	"golang.org/x/image/math/fixed"

	"gioui.org/op"
)

// A Line contains the measurements of a line of text.

M widget/icon.go => widget/icon.go +2 -1
@@ 7,11 7,12 @@ import (
	"image/color"
	"image/draw"

	"golang.org/x/exp/shiny/iconvg"

	"gioui.org/internal/f32color"
	"gioui.org/layout"
	"gioui.org/op/paint"
	"gioui.org/unit"
	"golang.org/x/exp/shiny/iconvg"
)

type Icon struct {

M widget/material/theme.go => widget/material/theme.go +2 -1
@@ 5,10 5,11 @@ package material
import (
	"image/color"

	"golang.org/x/exp/shiny/materialdesign/icons"

	"gioui.org/text"
	"gioui.org/unit"
	"gioui.org/widget"
	"golang.org/x/exp/shiny/materialdesign/icons"
)

// Palette contains the minimal set of colors that a widget may need to