~eliasnaur/gio-patches

gio: layout: reorder fields in Inset to match system.Insets v1 PROPOSED

~pierrec: 1
 layout: reorder fields in Inset to match system.Insets

 4 files changed, 5 insertions(+), 4 deletions(-)
#679746 apple.yml success
#679747 freebsd.yml failed
#679748 linux.yml success
#679749 openbsd.yml success
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~eliasnaur/gio-patches/patches/28660/mbox | git am -3
Learn more about email & git

[PATCH gio] layout: reorder fields in Inset to match system.Insets Export this patch

From: Pierre Curto <pierre.curto@gmail.com>

This makes it simple to convert from one into the other.

Signed-off-by: Pierre Curto <pierre.curto@gmail.com>
---
 app/os_android.go | 2 +-
 app/os_ios.go     | 2 +-
 app/os_js.go      | 3 ++-
 layout/layout.go  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/os_android.go b/app/os_android.go
index ab7f1ada..f835cbdb 100644
--- a/app/os_android.go
+++ b/app/os_android.go
@@ -587,9 +587,9 @@ func Java_org_gioui_GioView_onWindowInsets(env *C.JNIEnv, class C.jclass, view C
	w := views[view]
	w.insets = system.Insets{
		Top:    unit.Px(float32(top)),
		Right:  unit.Px(float32(right)),
		Bottom: unit.Px(float32(bottom)),
		Left:   unit.Px(float32(left)),
		Right:  unit.Px(float32(right)),
	}
	if w.stage >= system.StageRunning {
		w.draw(env, true)
diff --git a/app/os_ios.go b/app/os_ios.go
index df45fde9..3e8c3ba1 100644
--- a/app/os_ios.go
+++ b/app/os_ios.go
@@ -157,9 +157,9 @@ func (w *window) draw(sync bool) {
			},
			Insets: system.Insets{
				Top:    unit.Px(float32(params.top)),
				Right:  unit.Px(float32(params.right)),
				Bottom: unit.Px(float32(params.bottom)),
				Left:   unit.Px(float32(params.left)),
				Right:  unit.Px(float32(params.right)),
			},
			Metric: unit.Metric{
				PxPerDp: float32(params.dpi) * inchPrDp,
diff --git a/app/os_js.go b/app/os_js.go
index 55ec2694..23e49a99 100644
--- a/app/os_js.go
+++ b/app/os_js.go
@@ -609,7 +609,8 @@ func (w *window) draw(sync bool) {
}

func (w *window) getConfig() (image.Point, system.Insets, unit.Metric) {
	return image.Pt(w.config.Size.X, w.config.Size.Y), system.Insets{
	return image.Pt(w.config.Size.X, w.config.Size.Y),
		system.Insets{
			Bottom: unit.Px(w.inset.Y),
			Right:  unit.Px(w.inset.X),
		}, unit.Metric{
diff --git a/layout/layout.go b/layout/layout.go
index 2318c222..37876d16 100644
--- a/layout/layout.go
+++ b/layout/layout.go
@@ -113,7 +113,7 @@ func (c Constraints) Constrain(size image.Point) image.Point {
// constraints. The minimum constraints will be adjusted to ensure
// they do not exceed the maximum.
type Inset struct {
	Top, Right, Bottom, Left unit.Value
	Top, Bottom, Left, Right unit.Value
}

// Layout a widget.
-- 
2.32.0
gio/patches: FAILED in 20m56s

[layout: reorder fields in Inset to match system.Insets][0] from [~pierrec][1]

[0]: https://lists.sr.ht/~eliasnaur/gio-patches/patches/28660
[1]: mailto:pierre.curto@gmail.com

✓ #679749 SUCCESS gio/patches/openbsd.yml https://builds.sr.ht/~eliasnaur/job/679749
✓ #679746 SUCCESS gio/patches/apple.yml   https://builds.sr.ht/~eliasnaur/job/679746
✗ #679747 FAILED  gio/patches/freebsd.yml https://builds.sr.ht/~eliasnaur/job/679747
✓ #679748 SUCCESS gio/patches/linux.yml   https://builds.sr.ht/~eliasnaur/job/679748
Thanks, merged. Still think system.Inset should go, but perhaps that
introduces an import cycle?

Elias