From 48b6a73753e7ee567154297987f24a4d10485999 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 2 Apr 2019 17:09:06 +0200 Subject: [PATCH] all: run goimports gioui.org/ui was renamed from gioui.org/ui/ui before the release, but the import order wasn't changed accordingly. Signed-off-by: Elias Naur --- ui/app/internal/gpu/gpu.go | 2 +- ui/app/os_android.go | 2 +- ui/app/os_wayland.go | 2 +- ui/app/window.go | 2 +- ui/draw/draw.go | 2 +- ui/draw/path.go | 2 +- ui/gesture/gestures.go | 2 +- ui/layout/flex.go | 2 +- ui/layout/list.go | 2 +- ui/measure/measure.go | 2 +- ui/pointer/queue.go | 2 +- ui/text/editor.go | 2 +- ui/text/label.go | 2 +- ui/widget/image.go | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ui/app/internal/gpu/gpu.go b/ui/app/internal/gpu/gpu.go index 422f13a1..6afcc199 100644 --- a/ui/app/internal/gpu/gpu.go +++ b/ui/app/internal/gpu/gpu.go @@ -10,11 +10,11 @@ import ( "strings" "time" + "gioui.org/ui" "gioui.org/ui/app/internal/gl" gdraw "gioui.org/ui/draw" "gioui.org/ui/f32" "gioui.org/ui/internal/path" - "gioui.org/ui" "golang.org/x/image/draw" ) diff --git a/ui/app/os_android.go b/ui/app/os_android.go index c8640921..30a6d549 100644 --- a/ui/app/os_android.go +++ b/ui/app/os_android.go @@ -24,10 +24,10 @@ import ( "time" "unsafe" + "gioui.org/ui" "gioui.org/ui/f32" "gioui.org/ui/key" "gioui.org/ui/pointer" - "gioui.org/ui" ) type window struct { diff --git a/ui/app/os_wayland.go b/ui/app/os_wayland.go index 54e400ec..adb55bb4 100644 --- a/ui/app/os_wayland.go +++ b/ui/app/os_wayland.go @@ -19,10 +19,10 @@ import ( "unicode/utf8" "unsafe" + "gioui.org/ui" "gioui.org/ui/f32" "gioui.org/ui/key" "gioui.org/ui/pointer" - "gioui.org/ui" syscall "golang.org/x/sys/unix" ) diff --git a/ui/app/window.go b/ui/app/window.go index 3f3f6be3..c42e97fb 100644 --- a/ui/app/window.go +++ b/ui/app/window.go @@ -9,10 +9,10 @@ import ( "sync" "time" + "gioui.org/ui" "gioui.org/ui/app/internal/gpu" "gioui.org/ui/key" "gioui.org/ui/pointer" - "gioui.org/ui" ) type WindowOptions struct { diff --git a/ui/draw/draw.go b/ui/draw/draw.go index 271cce7d..59920485 100644 --- a/ui/draw/draw.go +++ b/ui/draw/draw.go @@ -6,9 +6,9 @@ import ( "image" "math" + "gioui.org/ui" "gioui.org/ui/f32" "gioui.org/ui/internal/path" - "gioui.org/ui" ) type OpImage struct { diff --git a/ui/draw/path.go b/ui/draw/path.go index da28dd74..7b105dbd 100644 --- a/ui/draw/path.go +++ b/ui/draw/path.go @@ -5,9 +5,9 @@ package draw import ( "math" + "gioui.org/ui" "gioui.org/ui/f32" "gioui.org/ui/internal/path" - "gioui.org/ui" ) type OpClip struct { diff --git a/ui/gesture/gestures.go b/ui/gesture/gestures.go index ffdf2c02..c3c598d9 100644 --- a/ui/gesture/gestures.go +++ b/ui/gesture/gestures.go @@ -8,9 +8,9 @@ import ( "runtime" "time" + "gioui.org/ui" "gioui.org/ui/f32" "gioui.org/ui/pointer" - "gioui.org/ui" ) type ClickEvent struct { diff --git a/ui/layout/flex.go b/ui/layout/flex.go index a3c588b7..491ff0f9 100644 --- a/ui/layout/flex.go +++ b/ui/layout/flex.go @@ -5,8 +5,8 @@ package layout import ( "image" - "gioui.org/ui/f32" "gioui.org/ui" + "gioui.org/ui/f32" ) type Flex struct { diff --git a/ui/layout/list.go b/ui/layout/list.go index 3d1fbfaf..84b4d917 100644 --- a/ui/layout/list.go +++ b/ui/layout/list.go @@ -5,10 +5,10 @@ package layout import ( "image" + "gioui.org/ui" "gioui.org/ui/draw" "gioui.org/ui/gesture" "gioui.org/ui/pointer" - "gioui.org/ui" ) type scrollChild struct { diff --git a/ui/measure/measure.go b/ui/measure/measure.go index 9fe96c3f..a99da8c8 100644 --- a/ui/measure/measure.go +++ b/ui/measure/measure.go @@ -7,10 +7,10 @@ import ( "unicode" "unicode/utf8" + "gioui.org/ui" "gioui.org/ui/draw" "gioui.org/ui/f32" "gioui.org/ui/text" - "gioui.org/ui" "golang.org/x/image/font" "golang.org/x/image/font/sfnt" "golang.org/x/image/math/fixed" diff --git a/ui/pointer/queue.go b/ui/pointer/queue.go index b2307617..86bd31c3 100644 --- a/ui/pointer/queue.go +++ b/ui/pointer/queue.go @@ -3,8 +3,8 @@ package pointer import ( - "gioui.org/ui/f32" "gioui.org/ui" + "gioui.org/ui/f32" ) type Queue struct { diff --git a/ui/text/editor.go b/ui/text/editor.go index 1d5f9697..610cb07d 100644 --- a/ui/text/editor.go +++ b/ui/text/editor.go @@ -8,13 +8,13 @@ import ( "time" "unicode/utf8" + "gioui.org/ui" "gioui.org/ui/draw" "gioui.org/ui/f32" "gioui.org/ui/gesture" "gioui.org/ui/key" "gioui.org/ui/layout" "gioui.org/ui/pointer" - "gioui.org/ui" "golang.org/x/image/math/fixed" ) diff --git a/ui/text/label.go b/ui/text/label.go index 29309ec7..2374ac5a 100644 --- a/ui/text/label.go +++ b/ui/text/label.go @@ -7,10 +7,10 @@ import ( "math" "unicode/utf8" + "gioui.org/ui" "gioui.org/ui/draw" "gioui.org/ui/f32" "gioui.org/ui/layout" - "gioui.org/ui" "golang.org/x/image/math/fixed" ) diff --git a/ui/widget/image.go b/ui/widget/image.go index e2839d56..5d6f42c0 100644 --- a/ui/widget/image.go +++ b/ui/widget/image.go @@ -5,10 +5,10 @@ package widget import ( "image" + "gioui.org/ui" "gioui.org/ui/draw" "gioui.org/ui/f32" "gioui.org/ui/layout" - "gioui.org/ui" ) type Image struct {