Merge branch 'worktree-agent-a9950b6fffa6f4a57'

examples/gallery/pages_layout.go

@@ -17,7 +17,7 @@ var layoutPages = []page{
 	{ID: "002", Name: "TitleBar", ZhName: "标题栏", Category: "Layout", Demo: layoutTitleBarDemo, Code: layoutTitleBarCode,
 		Keys: "Tools in the slots take Tab and Enter/Space as usual. Dragging the empty bar moves the window; double-click zooms it."},
 	{ID: "003", Name: "StatusBar", ZhName: "状态栏", Category: "Layout", Demo: layoutStatusBarDemo, Code: layoutStatusBarCode,
-		Keys: "Tab reaches action items; Enter or Space activates them. Plain status text is not a tab stop."},
+		Keys: "Tab reaches action items and the +N button; Enter or Space activates them. +N opens the folded items, Tab moves through them, Escape closes the list. Plain status text is not a tab stop."},
 	{ID: "004", Name: "Container", ZhName: "容器", Category: "Layout", Demo: layoutContainerDemo, Code: layoutContainerCode,
 		Keys: "None: Container never takes the focus."},
 	{ID: "005", Name: "Stack", ZhName: "堆叠", Category: "Layout", Demo: layoutStackDemo, Code: layoutStackCode,
@@ -46,10 +46,7 @@ func layoutCheck(c *ui.Context, v *bool, label string, log func(string)) {
 // layoutChoice is a labeled drop-down that logs its changes.
 func layoutChoice(c *ui.Context, v *string, label string, options []string, log func(string)) {
 	was := *v
-	ui.Row(c).Gap(8).Children(func() {
-		ui.Text(c, label)
-		ui.Select(c, v, options)
-	})
+	ui.Row(c).Gap(8).Children(func() { ui.Text(c, label); ui.Select(c, v, options) })
 	if *v != was {
 		log(fmt.Sprintf("%s: %s", label, *v))
 	}
@@ -70,8 +67,7 @@ func layoutSlider(c *ui.Context, v *float64, label string, lo, hi float64, log f
 func layoutControls(c *ui.Context, fn func()) { ui.Row(c).Wrap().Gap(12).Children(fn) }
 
 func layoutFrame(c *ui.Context, h float32, fn func()) *ui.Element {
-	k := mujica.Tokens(c)
-	return ui.Column(c).Height(h).Border(1, k.Border).Radius(4).Clip().Children(fn)
+	return ui.Column(c).Height(h).Border(1, mujica.Tokens(c).Border).Radius(4).Clip().Children(fn)
 }
 
 var layoutSpaces = []string{"Default", "None", "XS", "S", "M", "L", "XL", "XXL"}
@@ -266,7 +262,9 @@ func layoutStackDemo(c *ui.Context, log func(string)) {
 	layoutControls(c, func() {
 		layoutCheck(c, &s.horizontal, "Horizontal", log)
 		s.wrap = s.wrap && s.horizontal
-		layoutCheck(c, &s.wrap, "Wrap", log)
+		if s.horizontal {
+			layoutCheck(c, &s.wrap, "Wrap", log)
+		}
 		layoutCheck(c, &s.hide, "Hide Draft", log)
 		layoutChoice(c, &s.gap, "Gap", layoutSpaces, log)
 		layoutChoice(c, &s.align, "Align", aligns, log)

examples/gallery/pages_layout_test.go

@@ -0,0 +1,48 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/egoist/mygo/ui"
+
+	mujica "mujicaui"
+)
+
+func layoutPageTester(t *testing.T, id string, events *[]string) *ui.Tester {
+	t.Helper()
+	for _, p := range layoutPages {
+		if p.ID == id {
+			return ui.NewTester(func(c *ui.Context) {
+				mujica.Use(c, mujica.Settings{})
+				ui.Scroll(c).Fill().Children(func() {
+					p.Demo(c, func(s string) { *events = append(*events, s) })
+				})
+			}, 900, 700)
+		}
+	}
+	t.Fatalf("no layout page %s", id)
+	return nil
+}
+
+func TestLayoutStackDemoVerticalHasNoWrap(t *testing.T) {
+	var events []string
+	tt := layoutPageTester(t, "005", &events)
+	if err := tt.Click("Wrap"); err != nil {
+		t.Fatal(err)
+	}
+	if err := tt.Click("Horizontal"); err != nil {
+		t.Fatal(err)
+	}
+	if tt.HasText("Wrap") {
+		t.Fatal("Wrap control offered for a vertical stack")
+	}
+	if err := tt.Click("Horizontal"); err != nil {
+		t.Fatal(err)
+	}
+	if !tt.HasText("Wrap") {
+		t.Fatal("Wrap control missing for a horizontal stack")
+	}
+	if len(events) != 3 || events[1] != "Horizontal: false" {
+		t.Fatalf("events %q", events)
+	}
+}