From 0bd48686cbdd4c8175eb621bb195f5c61b4d2555 Mon Sep 17 00:00:00 2001
From: rigormorrtiss <rigormorrtiss@gmail.com>
Date: Wed, 28 Jul 2021 19:48:20 +0400
Subject: [PATCH] Set channels List title when guild is selected

---
 discordo.go | 7 ++++---
 ui/lists.go | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/discordo.go b/discordo.go
index 6f66a41..98a03df 100644
--- a/discordo.go
+++ b/discordo.go
@@ -167,12 +167,14 @@ func onGuildsDropDownSelected(text string, _ int) {
 		}
 	}
 
+	channelsList.SetTitle("Channels")
+	app.SetFocus(channelsList)
+
 	for i := range currentGuild.Channels {
 		channel := currentGuild.Channels[i]
 		channelsList.AddItem(channel.Name, "", 0, nil)
 	}
 
-	app.SetFocus(channelsList)
 }
 
 func onChannelsListSelected(i int, mainText string, secondaryText string, _ rune) {
@@ -183,11 +185,10 @@ func onChannelsListSelected(i int, mainText string, secondaryText string, _ rune
 		mainFlex.AddItem(messageInputField, 3, 1, false)
 	}
 
-	app.SetFocus(messageInputField)
-
 	currentChannel = currentGuild.Channels[i]
 
 	messagesTextView.SetTitle(currentChannel.Name)
+	app.SetFocus(messageInputField)
 
 	messages := util.GetMessages(session, currentChannel.ID, 50)
 	for i := len(messages) - 1; i >= 0; i-- {
diff --git a/ui/lists.go b/ui/lists.go
index 3b1148d..fcb507b 100644
--- a/ui/lists.go
+++ b/ui/lists.go
@@ -14,8 +14,7 @@ func NewChannelsList(onChannelsListSelected func(i int, mainText string, seconda
 		SetSelectedFunc(onChannelsListSelected)
 	channelsList.
 		SetBorder(true).
-		SetBorderPadding(0, 0, 1, 1).
-		SetTitle("Channels")
+		SetBorderPadding(0, 0, 1, 1)
 
 	return
 }