Fix visibility of placeholder on show for Entry

Fixes fyne-io#1193

widget/entry.go

@@ -98,7 +98,12 @@ func (e *Entry) CreateRenderer() fyne.WidgetRenderer {
 
 	e.propertyLock.Lock()
 	defer e.propertyLock.Unlock()
-	objects := []fyne.CanvasObject{line, e.placeholderProvider(), e.textProvider(), cursor}
+	provider := e.textProvider()
+	placeholder := e.placeholderProvider()
+	if provider.len() != 0 {
+		placeholder.Hide()
+	}
+	objects := []fyne.CanvasObject{line, placeholder, provider, cursor}
 
 	if e.Password && e.ActionItem == nil {
 		// An entry widget has been created via struct setting manually
@@ -1038,7 +1043,7 @@ func (r *entryRenderer) Refresh() {
 		return
 	}
 
-	if provider.len() == 0 && r.entry.Visible() {
+	if provider.len() == 0 {
 		placeholder.Show()
 	} else if placeholder.Visible() {
 		placeholder.Hide()

widget/entry_test.go

@@ -880,6 +880,23 @@ func TestEntry_PasteOverSelection(t *testing.T) {
 	assert.Equal(t, "TeInsertng", e.Text)
 }
 
+func TestEntry_Placeholder(t *testing.T) {
+	entry := &widget.Entry{}
+	entry.Text = "Text"
+	entry.PlaceHolder = "Placehold"
+
+	window := test.NewWindow(entry)
+	defer teardownImageTest(window)
+	c := window.Canvas()
+
+	assert.Equal(t, "Text", entry.Text)
+	test.AssertImageMatches(t, "entry/placeholder_withtext.png", c.Capture())
+
+	entry.SetText("")
+	assert.Equal(t, "", entry.Text)
+	test.AssertImageMatches(t, "entry/placeholder_initial.png", c.Capture())
+}
+
 func TestPasswordEntry_Placeholder(t *testing.T) {
 	entry, window := setupPasswordImageTest()
 	defer teardownImageTest(window)