Update scripts and add new containers and layouts

Author: andydotxyz

_gen/gendialogs.go

@@ -85,7 +85,7 @@ func main() {
 	c := w.Canvas().(test.WindowlessCanvas)
 
 	pwd, _ := os.Getwd()
-	imgDir = filepath.Join(pwd, "..", "images", "dialogs")
+	imgDir = filepath.Join(pwd, "..", "static", "images", "dialogs")
 
 	fyne.CurrentApp().Settings().SetTheme(theme.LightTheme())
 	for _, item := range makeDrawList() {

_gen/genicons.sh

@@ -6,7 +6,7 @@ cd "$(dirname "$0")"
 cd ..
 
 function srcFromRes() {
-  echo $1 | sed -e "s/IconRes/.svg/g" | sed --expression 's/\([A-Z]\)/-\L\1/g' --expression 's/^-//' \
+  echo $1 | sed -e "s/IconRes/.svg/g" | sed -e 's/\([A-Z]\)/-\L\1/g' -e 's/^-//' | sed -e "s/dragcorner/drag-corner-/g" \
     | sed -e "s/radiobutton/radio-button-/g" | sed -e "s/search/search-/g" | sed -e "s/color/color-/g" | sed -e "s/content/content-/g" \
     | sed -e "s/checkbox/check-box-/g" | sed -e "s/document/document-/g" | sed -e "s/more/more-/g" | sed -e "s/menu/menu-/g" \
     | sed -e "s/mail/mail-/g" | sed -e "s/media/media-/g" | sed -e "s/fast/fast-/g" | sed -e "s/skip/skip-/g" \
@@ -24,7 +24,7 @@ function stripDTD() {
 LINES=`grep NewThemedResource\( $ROOT/theme/icons.go | grep -v func | awk -F"IconName" '{print $2}'| awk -F":" '{gsub(/^[ \t]+/, "", $1); gsub(/[ \t]+$/, "", $1); gsub(/^[ \t]+/, "", $2); print $1 "|" $2}' | sed -e "s/NewThemedResource(//g" | sed -e "s/),//g"`
 SORTED=`echo $LINES | sed -e "s/ /\n/g" | sort`
 
-OUT="layout/_shortcodes/iconlist.html"
+OUT="layouts/_shortcodes/iconlist.html"
 echo '<ul class="theme-icon-list">' > $OUT
 for LINE in $SORTED; do
   IFS='|'; parts=($LINE); unset IFS;
@@ -43,3 +43,4 @@ done
 echo '</ul>' >> $OUT
 
 sed -i.bak 's/<?xml.*?>//' $OUT
+rm $OUT.bak

_gen/genlayouts.go

@@ -55,6 +55,7 @@ func makeDrawList() []drawItem {
 		{"gridwrap", fyne.NewContainerWithLayout(layout.NewGridWrapLayout(fyne.NewSize(75, 75)), makeObjs()...)},
 		{"max", fyne.NewContainerWithLayout(layout.NewMaxLayout(), makeObjs()...)},
 		{"padded", fyne.NewContainerWithLayout(layout.NewPaddedLayout(), makeObjs()...)},
+		{"rowwrap", fyne.NewContainerWithLayout(layout.NewRowWrapLayout(), makeMoreObjs()...)},
 		{"custompadded", fyne.NewContainerWithLayout(layout.NewCustomPaddedLayout(10, 20, 30, 15), makeObjs()...)},
 		{"combined", combined},
 	}
@@ -70,6 +71,18 @@ func makeObjs() []fyne.CanvasObject {
 	return []fyne.CanvasObject{prop1, prop2, prop3}
 }
 
+func makeMoreObjs() []fyne.CanvasObject {
+	prop1 := canvas.NewRectangle(boxColor())
+	prop1.SetMinSize(fyne.NewSize(50, 50))
+	prop2 := canvas.NewRectangle(boxColor())
+	prop2.SetMinSize(fyne.NewSize(100, 25))
+	prop3 := canvas.NewRectangle(boxColor())
+	prop3.SetMinSize(fyne.NewSize(50, 75))
+	prop4 := canvas.NewRectangle(boxColor())
+	prop4.SetMinSize(fyne.NewSize(75, 75))
+	return []fyne.CanvasObject{prop1, prop2, prop3, prop4}
+}
+
 func draw(scene fyne.CanvasObject, name string, c test.WindowlessCanvas, themeName string) {
 	fileName := filepath.Join(imgDir, name+"-"+themeName+".png")
 	file, err := os.Create(fileName)
@@ -98,7 +111,7 @@ func main() {
 	c := w.Canvas().(test.WindowlessCanvas)
 
 	pwd, _ := os.Getwd()
-	imgDir = filepath.Join(pwd, "..", "images", "layouts")
+	imgDir = filepath.Join(pwd, "..", "static", "images", "layouts")
 
 	fyne.CurrentApp().Settings().SetTheme(transparentBGTheme(theme.LightTheme()))
 	for _, item := range makeDrawList() {

_gen/genpdf.sh

@@ -49,6 +49,9 @@ func makeDrawList() []drawItem {
 		{"button", widget.NewButtonWithIcon("Cancel", theme.CancelIcon(), func() {})},
 		{"card", &widget.Card{Title: "Card Title", Subtitle: "Subtitle", Image: canvas.NewImageFromResource(theme.FyneLogo())}},
 		{"check", &widget.Check{Text: "Check", Checked: true}},
+		{"clip", container.NewGridWithColumns(2, container.NewClip(container.NewStack(
+			canvas.NewCircle(theme.ButtonColor()),
+			widget.NewLabel("A long line of text\nLine two is long"))))},
 		{"entry", &widget.Entry{PlaceHolder: "Entry", Scroll: container.ScrollNone}},
 		{"entry-invalid", makeInvalidEntry()},
 		{"entry-valid", &widget.Entry{Validator: func(_ string) error { return nil }, Text: "Valid", Scroll: container.ScrollNone}},
@@ -62,6 +65,7 @@ func makeDrawList() []drawItem {
 		{"icon", widget.NewIcon(theme.ContentPasteIcon())},
 		{"label", widget.NewLabel("Text label")},
 		{"list", makeList()},
+		{"navigation", container.NewNavigation(widget.NewLabel("Root item"))},
 		{"table", makeTable()},
 		{"tree", makeTree()},
 		{"password", &widget.Entry{PlaceHolder: "Password", Password: true, Scroll: container.ScrollNone}},
@@ -184,11 +188,18 @@ func draw(obj fyne.CanvasObject, name string, c fyne.Canvas, themeName string) {
 		time.Sleep(time.Second)
 	} else if name == "separator" {
 		c.(test.WindowlessCanvas).Resize(obj.MinSize().Add(fyne.NewSize(120+theme.Padding()*2, theme.Padding()*2)))
-	} else if name == "list" || name == "table" || name == "tree" || name == "gridwrap" || name == "accordion" {
+	} else if name == "list" || name == "table" || name == "tree" || name == "gridwrap" || name == "accordion" || name == "clip" {
 		c.(test.WindowlessCanvas).Resize(fyne.NewSize(136, 120))
 		test.TapCanvas(c, fyne.NewPos(50, 60))
 	}
 	img := c.Capture()
+	
+	if name == "navigation" {
+		c.Content().(*container.Navigation).PushWithTitle(widget.NewLabel("Child Content"), "Title")
+		c.(test.WindowlessCanvas).Resize(c.Size().AddWidthHeight(1, 1))
+		img = c.Capture()
+	}
+	
 	err = png.Encode(file, img)
 	if err != nil {
 		fyne.LogError("Unable to write image", err)
@@ -200,7 +211,7 @@ func main() {
 	c := w.Canvas()
 
 	pwd, _ := os.Getwd()
-	imgDir = filepath.Join(pwd, "..", "images", "widgets")
+	imgDir = filepath.Join(pwd, "..", "static", "images", "widgets")
 
 	fyne.CurrentApp().Settings().SetTheme(theme.LightTheme())
 	for _, item := range makeDrawList() {

_gen/genwidgets.go

@@ -2,29 +2,31 @@ module github.com/fyne-io/docs.fyne.io/gen
 
 go 1.19
 
-require fyne.io/fyne/v2 v2.5.0
+require fyne.io/fyne/v2 v2.7.0
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fredbi/uri v1.1.0 // indirect
-	github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe // indirect
-	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
-	github.com/go-text/render v0.1.0 // indirect
-	github.com/go-text/typesetting v0.1.0 // indirect
+	github.com/fredbi/uri v1.1.1 // indirect
+	github.com/fyne-io/gl-js v0.2.0 // indirect
+	github.com/fyne-io/oksvg v0.2.0 // indirect
+	github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
+	github.com/go-text/render v0.2.0 // indirect
+	github.com/go-text/typesetting v0.2.1 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/gopherjs/gopherjs v1.17.2 // indirect
-	github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 // indirect
-	github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect
+	github.com/hack-pad/go-indexeddb v0.3.2 // indirect
+	github.com/hack-pad/safejs v0.1.0 // indirect
+	github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rymdport/portal v0.2.2 // indirect
+	github.com/rymdport/portal v0.4.2 // indirect
 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
-	github.com/yuin/goldmark v1.7.1 // indirect
-	golang.org/x/image v0.18.0 // indirect
-	golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	github.com/stretchr/testify v1.11.1 // indirect
+	github.com/yuin/goldmark v1.7.8 // indirect
+	golang.org/x/image v0.24.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )