From ab3f26c394f15c2af440183a9bc6c2598efa205e Mon Sep 17 00:00:00 2001 From: ayn2op Date: Sun, 8 Jan 2023 14:23:03 +0530 Subject: [PATCH] reset method --- guilds_tree.go | 9 ++------- message_input.go | 12 +++++++++--- messages_text.go | 17 ++++++++++------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/guilds_tree.go b/guilds_tree.go index ab2de7a..e09adbe 100644 --- a/guilds_tree.go +++ b/guilds_tree.go @@ -139,13 +139,8 @@ func (gt *GuildsTree) createChildrenChannelNodes(n *tview.TreeNode, cs []discord func (gt *GuildsTree) onSelected(n *tview.TreeNode) { gt.selectedChannel = nil - messagesText.selectedMessage = nil - messagesText.Clear() - messagesText.SetTitle("") - messagesText.Highlight() - - messageInput.SetTitle("") - messageInput.SetText("") + messagesText.reset() + messageInput.reset() if len(n.GetChildren()) != 0 { n.SetExpanded(!n.IsExpanded()) diff --git a/message_input.go b/message_input.go index 7216ff6..ad6b100 100644 --- a/message_input.go +++ b/message_input.go @@ -34,11 +34,19 @@ func newMessageInput() *MessageInput { return mi } +func (mi *MessageInput) reset() { + mi.SetTitle("") + mi.SetText("") +} + func (mi *MessageInput) onInputCapture(event *tcell.EventKey) *tcell.EventKey { switch event.Name() { case cfg.Keys.MessageInput.Send: mi.sendAction() return nil + case cfg.Keys.MessageInput.Cancel: + mi.reset() + return nil } return event @@ -82,7 +90,5 @@ func (mi *MessageInput) sendAction() { return } - // Reset the message input. - mi.SetTitle("") - mi.SetText("") + messageInput.reset() } diff --git a/messages_text.go b/messages_text.go index c6f6512..db42aac 100644 --- a/messages_text.go +++ b/messages_text.go @@ -45,6 +45,14 @@ func newMessagesText() *MessagesText { return mt } +func (mt *MessagesText) reset() { + messagesText.selectedMessage = nil + + mt.SetTitle("") + mt.Clear() + mt.Highlight() +} + func (mt *MessagesText) newMessage(m *discord.Message) error { mt.buffer.Reset() @@ -154,13 +162,8 @@ func (mt *MessagesText) onInputCapture(event *tcell.EventKey) *tcell.EventKey { // TODO guildsTree.selectedChannel = nil - mt.selectedMessage = nil - mt.Clear() - mt.SetTitle("") - mt.Highlight() - - messageInput.SetText("") - messageInput.SetTitle("") + messagesText.reset() + messageInput.reset() return nil }