ayn2op il y a 3 ans
Parent
commit
ab3f26c394
3 fichiers modifiés avec 21 ajouts et 17 suppressions
  1. 2 7
      guilds_tree.go
  2. 9 3
      message_input.go
  3. 10 7
      messages_text.go

+ 2 - 7
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())

+ 9 - 3
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()
 }

+ 10 - 7
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
 	}