From bf23dbb8690abc396549f7a60e39fc8e80c99a36 Mon Sep 17 00:00:00 2001
From: doracpphp <dora.cpphp@gmail.com>
Date: Mon, 25 Jan 2021 11:32:58 +0900
Subject: [PATCH] Empty-layout-nil-avoidance

---
 declarative/dialog.go     | 6 ++++++
 declarative/mainwindow.go | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/declarative/dialog.go b/declarative/dialog.go
index e0c338134..7f8c06491 100644
--- a/declarative/dialog.go
+++ b/declarative/dialog.go
@@ -132,6 +132,12 @@ func (d Dialog) Create(owner walk.Form) error {
 			}
 		}
 
+		if d.Layout == nil {
+			if err := w.SetLayout(walk.NewVBoxLayout()); err != nil {
+				return err
+			}
+		}
+
 		if d.DefaultButton != nil {
 			if err := w.SetDefaultButton(*d.DefaultButton); err != nil {
 				return err
diff --git a/declarative/mainwindow.go b/declarative/mainwindow.go
index e22f65c07..9d779d456 100644
--- a/declarative/mainwindow.go
+++ b/declarative/mainwindow.go
@@ -176,6 +176,12 @@ func (mw MainWindow) Create() error {
 		// 	*mw.AssignTo = w
 		// }
 
+		if mw.Layout == nil {
+			if err := w.SetLayout(walk.NewVBoxLayout()); err != nil {
+				return err
+			}
+		}
+
 		if mw.Expressions != nil {
 			for name, expr := range mw.Expressions() {
 				builder.expressions[name] = expr