diff --git a/ui/app/GioActivity.java b/app/GioActivity.java similarity index 100% rename from ui/app/GioActivity.java rename to app/GioActivity.java diff --git a/ui/app/GioView.java b/app/GioView.java similarity index 100% rename from ui/app/GioView.java rename to app/GioView.java diff --git a/ui/app/app.go b/app/app.go similarity index 100% rename from ui/app/app.go rename to app/app.go diff --git a/ui/app/datadir.go b/app/datadir.go similarity index 100% rename from ui/app/datadir.go rename to app/datadir.go diff --git a/ui/app/datadir_android.go b/app/datadir_android.go similarity index 100% rename from ui/app/datadir_android.go rename to app/datadir_android.go diff --git a/ui/app/datadir_go112.go b/app/datadir_go112.go similarity index 100% rename from ui/app/datadir_go112.go rename to app/datadir_go112.go diff --git a/ui/app/doc.go b/app/doc.go similarity index 98% rename from ui/app/doc.go rename to app/doc.go index a78201c5..7b78b5ca 100644 --- a/ui/app/doc.go +++ b/app/doc.go @@ -43,7 +43,7 @@ For example, to display a blank but otherwise functional window: package main - import "gioui.org/ui/app" + import "gioui.org/app" func main() { go func() { diff --git a/ui/app/egl.go b/app/egl.go similarity index 99% rename from ui/app/egl.go rename to app/egl.go index 8a0d9d79..46c306d8 100644 --- a/ui/app/egl.go +++ b/app/egl.go @@ -10,7 +10,7 @@ import ( "runtime" "strings" - "gioui.org/ui/app/internal/gl" + "gioui.org/app/internal/gl" ) type context struct { diff --git a/ui/app/egl_android.go b/app/egl_android.go similarity index 100% rename from ui/app/egl_android.go rename to app/egl_android.go diff --git a/ui/app/egl_linux.go b/app/egl_linux.go similarity index 100% rename from ui/app/egl_linux.go rename to app/egl_linux.go diff --git a/ui/app/egl_wayland.go b/app/egl_wayland.go similarity index 100% rename from ui/app/egl_wayland.go rename to app/egl_wayland.go diff --git a/ui/app/egl_win.go b/app/egl_win.go similarity index 100% rename from ui/app/egl_win.go rename to app/egl_win.go diff --git a/ui/app/egl_windows.go b/app/egl_windows.go similarity index 99% rename from ui/app/egl_windows.go rename to app/egl_windows.go index 6101db14..cc49d43b 100644 --- a/ui/app/egl_windows.go +++ b/app/egl_windows.go @@ -8,7 +8,7 @@ import ( syscall "golang.org/x/sys/windows" - "gioui.org/ui/app/internal/gl" + "gioui.org/app/internal/gl" ) type ( diff --git a/ui/app/framework_ios.h b/app/framework_ios.h similarity index 100% rename from ui/app/framework_ios.h rename to app/framework_ios.h diff --git a/ui/app/gl_ios.go b/app/gl_ios.go similarity index 99% rename from ui/app/gl_ios.go rename to app/gl_ios.go index ae406eeb..ab509df6 100644 --- a/ui/app/gl_ios.go +++ b/app/gl_ios.go @@ -18,7 +18,7 @@ import ( "errors" "fmt" - "gioui.org/ui/app/internal/gl" + "gioui.org/app/internal/gl" ) type context struct { diff --git a/ui/app/gl_ios.h b/app/gl_ios.h similarity index 100% rename from ui/app/gl_ios.h rename to app/gl_ios.h diff --git a/ui/app/gl_ios.m b/app/gl_ios.m similarity index 100% rename from ui/app/gl_ios.m rename to app/gl_ios.m diff --git a/ui/app/gl_js.go b/app/gl_js.go similarity index 98% rename from ui/app/gl_js.go rename to app/gl_js.go index 12a9c5c6..7256c74c 100644 --- a/ui/app/gl_js.go +++ b/app/gl_js.go @@ -6,7 +6,7 @@ import ( "errors" "syscall/js" - "gioui.org/ui/app/internal/gl" + "gioui.org/app/internal/gl" ) type context struct { diff --git a/ui/app/gl_macos.go b/app/gl_macos.go similarity index 97% rename from ui/app/gl_macos.go rename to app/gl_macos.go index 124a126e..21bc681f 100644 --- a/ui/app/gl_macos.go +++ b/app/gl_macos.go @@ -5,7 +5,7 @@ package app import ( - "gioui.org/ui/app/internal/gl" + "gioui.org/app/internal/gl" ) /* diff --git a/ui/app/gl_macos.h b/app/gl_macos.h similarity index 100% rename from ui/app/gl_macos.h rename to app/gl_macos.h diff --git a/ui/app/gl_macos.m b/app/gl_macos.m similarity index 100% rename from ui/app/gl_macos.m rename to app/gl_macos.m diff --git a/ui/app/internal/gl/functions.go b/app/internal/gl/functions.go similarity index 100% rename from ui/app/internal/gl/functions.go rename to app/internal/gl/functions.go diff --git a/ui/app/internal/gl/gl.go b/app/internal/gl/gl.go similarity index 100% rename from ui/app/internal/gl/gl.go rename to app/internal/gl/gl.go diff --git a/ui/app/internal/gl/gl_js.go b/app/internal/gl/gl_js.go similarity index 100% rename from ui/app/internal/gl/gl_js.go rename to app/internal/gl/gl_js.go diff --git a/ui/app/internal/gl/gl_windows.go b/app/internal/gl/gl_windows.go similarity index 100% rename from ui/app/internal/gl/gl_windows.go rename to app/internal/gl/gl_windows.go diff --git a/ui/app/internal/gl/srgb.go b/app/internal/gl/srgb.go similarity index 100% rename from ui/app/internal/gl/srgb.go rename to app/internal/gl/srgb.go diff --git a/ui/app/internal/gl/types.go b/app/internal/gl/types.go similarity index 100% rename from ui/app/internal/gl/types.go rename to app/internal/gl/types.go diff --git a/ui/app/internal/gl/types_js.go b/app/internal/gl/types_js.go similarity index 100% rename from ui/app/internal/gl/types_js.go rename to app/internal/gl/types_js.go diff --git a/ui/app/internal/gl/util.go b/app/internal/gl/util.go similarity index 100% rename from ui/app/internal/gl/util.go rename to app/internal/gl/util.go diff --git a/ui/app/internal/gl/util_test.go b/app/internal/gl/util_test.go similarity index 100% rename from ui/app/internal/gl/util_test.go rename to app/internal/gl/util_test.go diff --git a/ui/app/internal/gpu/caches.go b/app/internal/gpu/caches.go similarity index 98% rename from ui/app/internal/gpu/caches.go rename to app/internal/gpu/caches.go index 3ede6575..26e88403 100644 --- a/ui/app/internal/gpu/caches.go +++ b/app/internal/gpu/caches.go @@ -5,7 +5,7 @@ package gpu import ( "fmt" - "gioui.org/ui/internal/ops" + "gioui.org/internal/ops" ) type resourceCache struct { diff --git a/ui/app/internal/gpu/context.go b/app/internal/gpu/context.go similarity index 99% rename from ui/app/internal/gpu/context.go rename to app/internal/gpu/context.go index 47e7d9fa..45d1d903 100644 --- a/ui/app/internal/gpu/context.go +++ b/app/internal/gpu/context.go @@ -6,7 +6,7 @@ import ( "errors" "strings" - "gioui.org/ui/app/internal/gl" + "gioui.org/app/internal/gl" ) type context struct { diff --git a/ui/app/internal/gpu/gpu.go b/app/internal/gpu/gpu.go similarity index 99% rename from ui/app/internal/gpu/gpu.go rename to app/internal/gpu/gpu.go index b7716b8f..8e05a1ce 100644 --- a/ui/app/internal/gpu/gpu.go +++ b/app/internal/gpu/gpu.go @@ -13,11 +13,11 @@ import ( "time" "gioui.org/ui" - "gioui.org/ui/app/internal/gl" - "gioui.org/ui/f32" - "gioui.org/ui/internal/opconst" - "gioui.org/ui/internal/ops" - "gioui.org/ui/paint" + "gioui.org/app/internal/gl" + "gioui.org/f32" + "gioui.org/internal/opconst" + "gioui.org/internal/ops" + "gioui.org/paint" "golang.org/x/image/draw" ) diff --git a/ui/app/internal/gpu/pack.go b/app/internal/gpu/pack.go similarity index 100% rename from ui/app/internal/gpu/pack.go rename to app/internal/gpu/pack.go diff --git a/ui/app/internal/gpu/path.go b/app/internal/gpu/path.go similarity index 99% rename from ui/app/internal/gpu/path.go rename to app/internal/gpu/path.go index caec7df0..97b73793 100644 --- a/ui/app/internal/gpu/path.go +++ b/app/internal/gpu/path.go @@ -9,9 +9,9 @@ import ( "image" "unsafe" - "gioui.org/ui/app/internal/gl" - "gioui.org/ui/f32" - "gioui.org/ui/internal/path" + "gioui.org/app/internal/gl" + "gioui.org/f32" + "gioui.org/internal/path" ) type pather struct { diff --git a/ui/app/internal/gpu/timer.go b/app/internal/gpu/timer.go similarity index 97% rename from ui/app/internal/gpu/timer.go rename to app/internal/gpu/timer.go index c030e3c9..00f7bb54 100644 --- a/ui/app/internal/gpu/timer.go +++ b/app/internal/gpu/timer.go @@ -5,7 +5,7 @@ package gpu import ( "time" - "gioui.org/ui/app/internal/gl" + "gioui.org/app/internal/gl" ) type timers struct { diff --git a/ui/app/internal/input/key.go b/app/internal/input/key.go similarity index 97% rename from ui/app/internal/input/key.go rename to app/internal/input/key.go index d2c95bf1..13407e83 100644 --- a/ui/app/internal/input/key.go +++ b/app/internal/input/key.go @@ -4,9 +4,9 @@ package input import ( "gioui.org/ui" - "gioui.org/ui/internal/opconst" - "gioui.org/ui/internal/ops" - "gioui.org/ui/key" + "gioui.org/internal/opconst" + "gioui.org/internal/ops" + "gioui.org/key" ) type TextInputState uint8 diff --git a/ui/app/internal/input/pointer.go b/app/internal/input/pointer.go similarity index 98% rename from ui/app/internal/input/pointer.go rename to app/internal/input/pointer.go index 31de1f68..d5288a2c 100644 --- a/ui/app/internal/input/pointer.go +++ b/app/internal/input/pointer.go @@ -7,10 +7,10 @@ import ( "image" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/internal/opconst" - "gioui.org/ui/internal/ops" - "gioui.org/ui/pointer" + "gioui.org/f32" + "gioui.org/internal/opconst" + "gioui.org/internal/ops" + "gioui.org/pointer" ) type pointerQueue struct { diff --git a/ui/app/internal/input/router.go b/app/internal/input/router.go similarity index 96% rename from ui/app/internal/input/router.go rename to app/internal/input/router.go index fba8ac2f..f1c16549 100644 --- a/ui/app/internal/input/router.go +++ b/app/internal/input/router.go @@ -7,11 +7,11 @@ import ( "time" "gioui.org/ui" - "gioui.org/ui/internal/opconst" - "gioui.org/ui/internal/ops" - "gioui.org/ui/key" - "gioui.org/ui/pointer" - "gioui.org/ui/system" + "gioui.org/internal/opconst" + "gioui.org/internal/ops" + "gioui.org/key" + "gioui.org/pointer" + "gioui.org/system" ) // Router is a Queue implementation that routes events from diff --git a/ui/app/log_android.go b/app/log_android.go similarity index 100% rename from ui/app/log_android.go rename to app/log_android.go diff --git a/ui/app/log_ios.go b/app/log_ios.go similarity index 100% rename from ui/app/log_ios.go rename to app/log_ios.go diff --git a/ui/app/log_ios.h b/app/log_ios.h similarity index 100% rename from ui/app/log_ios.h rename to app/log_ios.h diff --git a/ui/app/log_ios.m b/app/log_ios.m similarity index 100% rename from ui/app/log_ios.m rename to app/log_ios.m diff --git a/ui/app/os_android.c b/app/os_android.c similarity index 100% rename from ui/app/os_android.c rename to app/os_android.c diff --git a/ui/app/os_android.go b/app/os_android.go similarity index 99% rename from ui/app/os_android.go rename to app/os_android.go index 18931386..b0b66cc5 100644 --- a/ui/app/os_android.go +++ b/app/os_android.go @@ -25,9 +25,9 @@ import ( "unsafe" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/key" - "gioui.org/ui/pointer" + "gioui.org/f32" + "gioui.org/key" + "gioui.org/pointer" ) type window struct { diff --git a/ui/app/os_android.h b/app/os_android.h similarity index 100% rename from ui/app/os_android.h rename to app/os_android.h diff --git a/ui/app/os_ios.go b/app/os_ios.go similarity index 98% rename from ui/app/os_ios.go rename to app/os_ios.go index cd144818..e6b2b877 100644 --- a/ui/app/os_ios.go +++ b/app/os_ios.go @@ -23,9 +23,9 @@ import ( "time" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/key" - "gioui.org/ui/pointer" + "gioui.org/f32" + "gioui.org/key" + "gioui.org/pointer" ) type window struct { diff --git a/ui/app/os_ios.h b/app/os_ios.h similarity index 100% rename from ui/app/os_ios.h rename to app/os_ios.h diff --git a/ui/app/os_ios.m b/app/os_ios.m similarity index 100% rename from ui/app/os_ios.m rename to app/os_ios.m diff --git a/ui/app/os_js.go b/app/os_js.go similarity index 99% rename from ui/app/os_js.go rename to app/os_js.go index 63a19389..e9b34159 100644 --- a/ui/app/os_js.go +++ b/app/os_js.go @@ -8,9 +8,9 @@ import ( "syscall/js" "time" - "gioui.org/ui/f32" - "gioui.org/ui/key" - "gioui.org/ui/pointer" + "gioui.org/f32" + "gioui.org/key" + "gioui.org/pointer" ) type window struct { diff --git a/ui/app/os_macos.go b/app/os_macos.go similarity index 99% rename from ui/app/os_macos.go rename to app/os_macos.go index 90f26625..3761ad99 100644 --- a/ui/app/os_macos.go +++ b/app/os_macos.go @@ -19,9 +19,9 @@ import ( "time" "unsafe" - "gioui.org/ui/f32" - "gioui.org/ui/key" - "gioui.org/ui/pointer" + "gioui.org/f32" + "gioui.org/key" + "gioui.org/pointer" ) func init() { diff --git a/ui/app/os_macos.h b/app/os_macos.h similarity index 100% rename from ui/app/os_macos.h rename to app/os_macos.h diff --git a/ui/app/os_macos.m b/app/os_macos.m similarity index 100% rename from ui/app/os_macos.m rename to app/os_macos.m diff --git a/ui/app/os_wayland.c b/app/os_wayland.c similarity index 100% rename from ui/app/os_wayland.c rename to app/os_wayland.c diff --git a/ui/app/os_wayland.go b/app/os_wayland.go similarity index 99% rename from ui/app/os_wayland.go rename to app/os_wayland.go index b5b9326f..8f4905db 100644 --- a/ui/app/os_wayland.go +++ b/app/os_wayland.go @@ -16,10 +16,10 @@ import ( "time" "unsafe" - "gioui.org/ui/f32" - "gioui.org/ui/internal/fling" - "gioui.org/ui/key" - "gioui.org/ui/pointer" + "gioui.org/f32" + "gioui.org/internal/fling" + "gioui.org/key" + "gioui.org/pointer" syscall "golang.org/x/sys/unix" ) diff --git a/ui/app/os_wayland.h b/app/os_wayland.h similarity index 100% rename from ui/app/os_wayland.h rename to app/os_wayland.h diff --git a/ui/app/os_windows.go b/app/os_windows.go similarity index 99% rename from ui/app/os_windows.go rename to app/os_windows.go index 38ae2ca6..0e59dd4c 100644 --- a/ui/app/os_windows.go +++ b/app/os_windows.go @@ -14,9 +14,9 @@ import ( syscall "golang.org/x/sys/windows" - "gioui.org/ui/f32" - "gioui.org/ui/key" - "gioui.org/ui/pointer" + "gioui.org/f32" + "gioui.org/key" + "gioui.org/pointer" ) var winMap = make(map[syscall.Handle]*window) diff --git a/ui/app/runmain.go b/app/runmain.go similarity index 100% rename from ui/app/runmain.go rename to app/runmain.go diff --git a/ui/app/runmain_ios.go b/app/runmain_ios.go similarity index 100% rename from ui/app/runmain_ios.go rename to app/runmain_ios.go diff --git a/ui/app/sigpipe_darwin.go b/app/sigpipe_darwin.go similarity index 100% rename from ui/app/sigpipe_darwin.go rename to app/sigpipe_darwin.go diff --git a/ui/app/wayland_text_input.c b/app/wayland_text_input.c similarity index 100% rename from ui/app/wayland_text_input.c rename to app/wayland_text_input.c diff --git a/ui/app/wayland_text_input.h b/app/wayland_text_input.h similarity index 100% rename from ui/app/wayland_text_input.h rename to app/wayland_text_input.h diff --git a/ui/app/wayland_xdg_decoration.c b/app/wayland_xdg_decoration.c similarity index 100% rename from ui/app/wayland_xdg_decoration.c rename to app/wayland_xdg_decoration.c diff --git a/ui/app/wayland_xdg_decoration.h b/app/wayland_xdg_decoration.h similarity index 100% rename from ui/app/wayland_xdg_decoration.h rename to app/wayland_xdg_decoration.h diff --git a/ui/app/wayland_xdg_shell.c b/app/wayland_xdg_shell.c similarity index 100% rename from ui/app/wayland_xdg_shell.c rename to app/wayland_xdg_shell.c diff --git a/ui/app/wayland_xdg_shell.h b/app/wayland_xdg_shell.h similarity index 100% rename from ui/app/wayland_xdg_shell.h rename to app/wayland_xdg_shell.h diff --git a/ui/app/window.go b/app/window.go similarity index 98% rename from ui/app/window.go rename to app/window.go index d08b3874..523cedd4 100644 --- a/ui/app/window.go +++ b/app/window.go @@ -9,9 +9,9 @@ import ( "time" "gioui.org/ui" - "gioui.org/ui/app/internal/gpu" - "gioui.org/ui/app/internal/input" - "gioui.org/ui/system" + "gioui.org/app/internal/gpu" + "gioui.org/app/internal/input" + "gioui.org/system" ) // WindowOption configures a Window. diff --git a/ui/app/xkb_linux.go b/app/xkb_linux.go similarity index 99% rename from ui/app/xkb_linux.go rename to app/xkb_linux.go index a81d5444..ca4d3017 100644 --- a/ui/app/xkb_linux.go +++ b/app/xkb_linux.go @@ -22,7 +22,7 @@ import ( "unicode/utf8" "unsafe" - "gioui.org/ui/key" + "gioui.org/key" ) type xkb struct { diff --git a/ui/f32/f32.go b/f32/f32.go similarity index 100% rename from ui/f32/f32.go rename to f32/f32.go diff --git a/ui/gesture/gesture.go b/gesture/gesture.go similarity index 98% rename from ui/gesture/gesture.go rename to gesture/gesture.go index 164825a9..cfae9d2e 100644 --- a/ui/gesture/gesture.go +++ b/gesture/gesture.go @@ -13,9 +13,9 @@ import ( "math" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/internal/fling" - "gioui.org/ui/pointer" + "gioui.org/f32" + "gioui.org/internal/fling" + "gioui.org/pointer" ) // Click detects click gestures in the form diff --git a/ui/go.mod b/go.mod similarity index 86% rename from ui/go.mod rename to go.mod index 42de2447..2d1341e7 100644 --- a/ui/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gioui.org/ui +module gioui.org go 1.13 diff --git a/ui/go.sum b/go.sum similarity index 100% rename from ui/go.sum rename to go.sum diff --git a/ui/internal/fling/animation.go b/internal/fling/animation.go similarity index 100% rename from ui/internal/fling/animation.go rename to internal/fling/animation.go diff --git a/ui/internal/fling/extrapolation.go b/internal/fling/extrapolation.go similarity index 100% rename from ui/internal/fling/extrapolation.go rename to internal/fling/extrapolation.go diff --git a/ui/internal/fling/extrapolation_test.go b/internal/fling/extrapolation_test.go similarity index 100% rename from ui/internal/fling/extrapolation_test.go rename to internal/fling/extrapolation_test.go diff --git a/ui/internal/opconst/ops.go b/internal/opconst/ops.go similarity index 100% rename from ui/internal/opconst/ops.go rename to internal/opconst/ops.go diff --git a/ui/internal/ops/ops.go b/internal/ops/ops.go similarity index 88% rename from ui/internal/ops/ops.go rename to internal/ops/ops.go index c324efd2..27e17084 100644 --- a/ui/internal/ops/ops.go +++ b/internal/ops/ops.go @@ -7,8 +7,8 @@ import ( "math" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/internal/opconst" + "gioui.org/f32" + "gioui.org/internal/opconst" ) func DecodeTransformOp(d []byte) ui.TransformOp { diff --git a/ui/internal/ops/reader.go b/internal/ops/reader.go similarity index 99% rename from ui/internal/ops/reader.go rename to internal/ops/reader.go index 02c037cc..8cd60de5 100644 --- a/ui/internal/ops/reader.go +++ b/internal/ops/reader.go @@ -6,7 +6,7 @@ import ( "encoding/binary" "gioui.org/ui" - "gioui.org/ui/internal/opconst" + "gioui.org/internal/opconst" ) // Reader parses an ops list. diff --git a/ui/internal/path/path.go b/internal/path/path.go similarity index 100% rename from ui/internal/path/path.go rename to internal/path/path.go diff --git a/ui/key/key.go b/key/key.go similarity index 98% rename from ui/key/key.go rename to key/key.go index 85683f07..ba3dfb62 100644 --- a/ui/key/key.go +++ b/key/key.go @@ -11,7 +11,7 @@ package key import ( "gioui.org/ui" - "gioui.org/ui/internal/opconst" + "gioui.org/internal/opconst" ) // InputOp declares a handler ready for key events. diff --git a/ui/layout/doc.go b/layout/doc.go similarity index 100% rename from ui/layout/doc.go rename to layout/doc.go diff --git a/ui/layout/flex.go b/layout/flex.go similarity index 99% rename from ui/layout/flex.go rename to layout/flex.go index 8d799a66..5e6ac636 100644 --- a/ui/layout/flex.go +++ b/layout/flex.go @@ -5,8 +5,8 @@ package layout import ( "image" + "gioui.org/f32" "gioui.org/ui" - "gioui.org/ui/f32" ) // Flex lays out child elements along an axis, diff --git a/ui/layout/layout.go b/layout/layout.go similarity index 100% rename from ui/layout/layout.go rename to layout/layout.go diff --git a/ui/layout/layout_test.go b/layout/layout_test.go similarity index 99% rename from ui/layout/layout_test.go rename to layout/layout_test.go index 7d581473..5acb6bb7 100644 --- a/ui/layout/layout_test.go +++ b/layout/layout_test.go @@ -5,8 +5,8 @@ import ( "image" "time" + "gioui.org/layout" "gioui.org/ui" - "gioui.org/ui/layout" ) type queue struct{} diff --git a/ui/layout/list.go b/layout/list.go similarity index 98% rename from ui/layout/list.go rename to layout/list.go index 42a5f6c5..2d53f266 100644 --- a/ui/layout/list.go +++ b/layout/list.go @@ -6,9 +6,9 @@ import ( "image" "gioui.org/ui" - "gioui.org/ui/gesture" - "gioui.org/ui/paint" - "gioui.org/ui/pointer" + "gioui.org/gesture" + "gioui.org/paint" + "gioui.org/pointer" ) type scrollChild struct { diff --git a/ui/layout/stack.go b/layout/stack.go similarity index 100% rename from ui/layout/stack.go rename to layout/stack.go diff --git a/ui/measure/measure.go b/measure/measure.go similarity index 99% rename from ui/measure/measure.go rename to measure/measure.go index 112700b7..1b7c99da 100644 --- a/ui/measure/measure.go +++ b/measure/measure.go @@ -11,9 +11,9 @@ import ( "unicode/utf8" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/paint" - "gioui.org/ui/text" + "gioui.org/f32" + "gioui.org/paint" + "gioui.org/text" "golang.org/x/image/font" "golang.org/x/image/font/sfnt" "golang.org/x/image/math/fixed" diff --git a/ui/measure/opentype.go b/measure/opentype.go similarity index 100% rename from ui/measure/opentype.go rename to measure/opentype.go diff --git a/ui/paint/doc.go b/paint/doc.go similarity index 100% rename from ui/paint/doc.go rename to paint/doc.go diff --git a/ui/paint/paint.go b/paint/paint.go similarity index 97% rename from ui/paint/paint.go rename to paint/paint.go index e7cd6cd5..160f45bd 100644 --- a/ui/paint/paint.go +++ b/paint/paint.go @@ -9,8 +9,8 @@ import ( "math" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/internal/opconst" + "gioui.org/f32" + "gioui.org/internal/opconst" ) // ImageOp sets the material to a section of an diff --git a/ui/paint/path.go b/paint/path.go similarity index 98% rename from ui/paint/path.go rename to paint/path.go index 029a3829..89265361 100644 --- a/ui/paint/path.go +++ b/paint/path.go @@ -8,9 +8,9 @@ import ( "unsafe" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/internal/opconst" - "gioui.org/ui/internal/path" + "gioui.org/f32" + "gioui.org/internal/opconst" + "gioui.org/internal/path" ) // PathBuilder builds and adds a general ClipOp clip path diff --git a/ui/pointer/doc.go b/pointer/doc.go similarity index 100% rename from ui/pointer/doc.go rename to pointer/doc.go diff --git a/ui/pointer/pointer.go b/pointer/pointer.go similarity index 98% rename from ui/pointer/pointer.go rename to pointer/pointer.go index 7a9dfea4..6b763af6 100644 --- a/ui/pointer/pointer.go +++ b/pointer/pointer.go @@ -8,8 +8,8 @@ import ( "time" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/internal/opconst" + "gioui.org/f32" + "gioui.org/internal/opconst" ) // Event is a pointer event. diff --git a/ui/system/system.go b/system/system.go similarity index 94% rename from ui/system/system.go rename to system/system.go index fb4eced6..dc2bad1c 100644 --- a/ui/system/system.go +++ b/system/system.go @@ -6,7 +6,7 @@ package system import ( "gioui.org/ui" - "gioui.org/ui/internal/opconst" + "gioui.org/internal/opconst" ) // ProfileOp registers a handler for receiving diff --git a/ui/text/buffer.go b/text/buffer.go similarity index 100% rename from ui/text/buffer.go rename to text/buffer.go diff --git a/ui/text/editor.go b/text/editor.go similarity index 99% rename from ui/text/editor.go rename to text/editor.go index dae1a9ec..8a982e83 100644 --- a/ui/text/editor.go +++ b/text/editor.go @@ -10,11 +10,11 @@ import ( "unicode/utf8" "gioui.org/ui" - "gioui.org/ui/gesture" - "gioui.org/ui/key" - "gioui.org/ui/layout" - "gioui.org/ui/paint" - "gioui.org/ui/pointer" + "gioui.org/gesture" + "gioui.org/key" + "gioui.org/layout" + "gioui.org/paint" + "gioui.org/pointer" "golang.org/x/image/math/fixed" ) diff --git a/ui/text/label.go b/text/label.go similarity index 98% rename from ui/text/label.go rename to text/label.go index f0fedbed..423034a7 100644 --- a/ui/text/label.go +++ b/text/label.go @@ -9,9 +9,9 @@ import ( "unicode/utf8" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/layout" - "gioui.org/ui/paint" + "gioui.org/f32" + "gioui.org/layout" + "gioui.org/paint" "golang.org/x/image/math/fixed" ) diff --git a/ui/text/measure.go b/text/measure.go similarity index 99% rename from ui/text/measure.go rename to text/measure.go index 91853ab5..62865d41 100644 --- a/ui/text/measure.go +++ b/text/measure.go @@ -7,7 +7,7 @@ import ( "image" "gioui.org/ui" - "gioui.org/ui/layout" + "gioui.org/layout" "golang.org/x/image/math/fixed" ) diff --git a/ui/doc.go b/ui/doc.go index 533282b5..4b113f2a 100644 --- a/ui/doc.go +++ b/ui/doc.go @@ -20,8 +20,8 @@ to a ui/app.Window's Update method. Drawing a colored square: import "gioui.org/ui" - import "gioui.org/ui/app" - import "gioui.org/ui/paint" + import "gioui.org/app" + import "gioui.org/paint" var w app.Window ops := new(ui.Ops) diff --git a/ui/ops.go b/ui/ops.go index c7c8204e..e667934a 100644 --- a/ui/ops.go +++ b/ui/ops.go @@ -5,7 +5,7 @@ package ui import ( "encoding/binary" - "gioui.org/ui/internal/opconst" + "gioui.org/internal/opconst" ) // Ops holds a list of operations. Operations are stored in diff --git a/ui/ui.go b/ui/ui.go index 16e2f115..5ed1bd1e 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -7,8 +7,8 @@ import ( "math" "time" - "gioui.org/ui/f32" - "gioui.org/ui/internal/opconst" + "gioui.org/f32" + "gioui.org/internal/opconst" ) // Config define the essential properties of diff --git a/ui/widget/image.go b/widget/image.go similarity index 95% rename from ui/widget/image.go rename to widget/image.go index 1924a4b7..7b3e68d7 100644 --- a/ui/widget/image.go +++ b/widget/image.go @@ -7,9 +7,9 @@ import ( "image" "gioui.org/ui" - "gioui.org/ui/f32" - "gioui.org/ui/layout" - "gioui.org/ui/paint" + "gioui.org/f32" + "gioui.org/layout" + "gioui.org/paint" ) // Image is a widget that displays an image.