From fe5fbe90398f9c28c74a66c9eb4b433854973384 Mon Sep 17 00:00:00 2001
From: Ankush Jadhav <anks257@gmail.com>
Date: Sat, 17 Apr 2021 11:55:12 +0530
Subject: [PATCH 1/2] Fix Form does not render HintTexts for more than one item

---
 widget/form.go                          |   2 +-
 widget/form_test.go                     |  23 +++++++++++++++++++++++
 widget/testdata/form/hints_rendered.png | Bin 0 -> 3155 bytes
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 widget/testdata/form/hints_rendered.png

diff --git a/widget/form.go b/widget/form.go
index 7ca8628f7d..4911756fe2 100644
--- a/widget/form.go
+++ b/widget/form.go
@@ -69,7 +69,7 @@ func (f *Form) AppendItem(item *FormItem) {
 	f.Items = append(f.Items, item)
 	if f.itemGrid != nil {
 		f.itemGrid.Add(f.createLabel(item.Text))
-		f.itemGrid.Add(item.Widget)
+		f.itemGrid.Add(f.createInput(item))
 		f.setUpValidation(item.Widget, len(f.Items)-1)
 	}
 
diff --git a/widget/form_test.go b/widget/form_test.go
index 5404320cae..e024c910a0 100644
--- a/widget/form_test.go
+++ b/widget/form_test.go
@@ -300,3 +300,26 @@ func TestForm_Disable_Validation(t *testing.T) {
 
 	test.AssertImageMatches(t, "form/disable_validation_disabled_valid.png", w.Canvas().Capture())
 }
+
+func TestForm_HintsRendered(t *testing.T) {
+	f := NewForm()
+
+	fi1 := NewFormItem("Form Item 1", NewEntry())
+	fi1.HintText = "HT1"
+	f.AppendItem(fi1)
+
+	fi2 := NewFormItem("Form Item 2", NewEntry())
+	fi2.HintText = "HT2"
+
+	f.AppendItem(fi2)
+
+	fi3 := NewFormItem("Form Item 3", NewEntry())
+	fi3.HintText = "HT3"
+
+	f.AppendItem(fi3)
+
+	w := test.NewWindow(f)
+	defer w.Close()
+
+	test.AssertImageMatches(t, "form/hints_rendered.png", w.Canvas().Capture())
+}
diff --git a/widget/testdata/form/hints_rendered.png b/widget/testdata/form/hints_rendered.png
new file mode 100644
index 0000000000000000000000000000000000000000..a62a2137d251dd2250c1a937a5f3bbf7a63303e6
GIT binary patch
literal 3155
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

literal 0
HcmV?d00001


From 55ccd8c534368baeb34b94a129ddb9a9db58e328 Mon Sep 17 00:00:00 2001
From: Ankush Jadhav <anks257@gmail.com>
Date: Sat, 17 Apr 2021 12:07:34 +0530
Subject: [PATCH 2/2] fixed breaking test

---
 widget/form_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/widget/form_test.go b/widget/form_test.go
index e024c910a0..086b00baf6 100644
--- a/widget/form_test.go
+++ b/widget/form_test.go
@@ -302,6 +302,10 @@ func TestForm_Disable_Validation(t *testing.T) {
 }
 
 func TestForm_HintsRendered(t *testing.T) {
+	app := test.NewApp()
+	defer test.NewApp()
+	app.Settings().SetTheme(theme.LightTheme())
+
 	f := NewForm()
 
 	fi1 := NewFormItem("Form Item 1", NewEntry())