diff --git a/ui/actions_view.go b/ui/actions_view.go index d437a1e..7cd69eb 100644 --- a/ui/actions_view.go +++ b/ui/actions_view.go @@ -105,7 +105,7 @@ func (v *ActionsView) selectReplyAction() { return } - v.app.view.MessagesView.selectedMessage, _ = findMessageByID(ms, v.message.ReferencedMessage.ID) + v.app.view.MessagesView.selected, _ = findMessageByID(ms, v.message.ReferencedMessage.ID) v.app.view.MessagesView. Highlight(v.message.ReferencedMessage.ID.String()). ScrollToHighlight() diff --git a/ui/channels_view.go b/ui/channels_view.go index de667ab..7811010 100644 --- a/ui/channels_view.go +++ b/ui/channels_view.go @@ -36,7 +36,7 @@ func newChannelsView(app *Application) *ChannelsView { func (v *ChannelsView) onSelected(node *tview.TreeNode) { v.selected = nil - v.app.view.MessagesView.selectedMessage = -1 + v.app.view.MessagesView.selected = -1 v.app.view.MessagesView. Highlight(). Clear(). diff --git a/ui/guilds_view.go b/ui/guilds_view.go index c1496bb..a6fd95c 100644 --- a/ui/guilds_view.go +++ b/ui/guilds_view.go @@ -7,13 +7,15 @@ import ( type GuildsView struct { *tview.TreeView + app *Application } func newGuildsView(app *Application) *GuildsView { v := &GuildsView{ TreeView: tview.NewTreeView(), - app: app, + + app: app, } root := tview.NewTreeNode("") @@ -33,7 +35,7 @@ func newGuildsView(app *Application) *GuildsView { func (v *GuildsView) onSelected(node *tview.TreeNode) { v.app.view.ChannelsView.selected = nil - v.app.view.MessagesView.selectedMessage = -1 + v.app.view.MessagesView.selected = -1 rootNode := v.app.view.ChannelsView.GetRoot() rootNode.ClearChildren() v.app.view.MessagesView. diff --git a/ui/input_view.go b/ui/input_view.go index 0b89114..8332844 100644 --- a/ui/input_view.go +++ b/ui/input_view.go @@ -17,13 +17,15 @@ import ( type InputView struct { *tview.InputField + app *Application } func newInputView(app *Application) *InputView { v := &InputView{ InputField: tview.NewInputField(), - app: app, + + app: app, } v.SetFieldBackgroundColor(tview.Styles.PrimitiveBackgroundColor) @@ -50,7 +52,7 @@ func (v *InputView) inputCapture(event *tcell.EventKey) *tcell.EventKey { v. SetText(""). SetTitle("") - v.app.view.MessagesView.selectedMessage = -1 + v.app.view.MessagesView.selected = -1 v.app.view.MessagesView.Highlight() return nil } @@ -97,7 +99,7 @@ func (v *InputView) sendMessage() *tcell.EventKey { go v.app.state.SendMessageComplex(m.ChannelID, d) - v.app.view.MessagesView.selectedMessage = -1 + v.app.view.MessagesView.selected = -1 v.app.view.MessagesView.Highlight() v.SetTitle("") diff --git a/ui/messages_view.go b/ui/messages_view.go index 3b04a45..ad202b3 100644 --- a/ui/messages_view.go +++ b/ui/messages_view.go @@ -10,16 +10,18 @@ import ( type MessagesView struct { *tview.TextView + // The index of the currently selected message. A negative index indicates that there is no currently selected message. - selectedMessage int - app *Application + selected int + app *Application } func newMessagesView(app *Application) *MessagesView { v := &MessagesView{ - TextView: tview.NewTextView(), - selectedMessage: -1, - app: app, + TextView: tview.NewTextView(), + + selected: -1, + app: app, } v.SetDynamicColors(true) @@ -90,7 +92,7 @@ func (v *MessagesView) onInputCapture(e *tcell.EventKey) *tcell.EventKey { case v.app.config.Keys.MessagesView.SelectLastMessage: return v.selectLastMessage(ms) case "Esc": - v.selectedMessage = -1 + v.selected = -1 v.app.SetFocus(v.app.view) v. Clear(). @@ -105,17 +107,17 @@ func (v *MessagesView) onInputCapture(e *tcell.EventKey) *tcell.EventKey { func (v *MessagesView) selectPreviousMessage(ms []discord.Message) *tcell.EventKey { // If there are no highlighted regions, select the latest (last) message. if len(v.GetHighlights()) == 0 { - v.selectedMessage = 0 + v.selected = 0 } else { // If the selected message is the oldest (first) message, select the latest (last) message. - if v.selectedMessage == len(ms)-1 { - v.selectedMessage = 0 + if v.selected == len(ms)-1 { + v.selected = 0 } else { - v.selectedMessage++ + v.selected++ } } - v.Highlight(ms[v.selectedMessage].ID.String()) + v.Highlight(ms[v.selected].ID.String()) v.ScrollToHighlight() return nil } @@ -123,34 +125,34 @@ func (v *MessagesView) selectPreviousMessage(ms []discord.Message) *tcell.EventK func (v *MessagesView) selectNextMessage(ms []discord.Message) *tcell.EventKey { // If there are no highlighted regions, select the latest (last) message. if len(v.GetHighlights()) == 0 { - v.selectedMessage = 0 + v.selected = 0 } else { // If the selected message is the latest (last) message, select the oldest (first) message. - if v.selectedMessage == 0 { - v.selectedMessage = len(ms) - 1 + if v.selected == 0 { + v.selected = len(ms) - 1 } else { - v.selectedMessage-- + v.selected-- } } v. - Highlight(ms[v.selectedMessage].ID.String()). + Highlight(ms[v.selected].ID.String()). ScrollToHighlight() return nil } func (v *MessagesView) selectFirstMessage(ms []discord.Message) *tcell.EventKey { - v.selectedMessage = len(ms) - 1 + v.selected = len(ms) - 1 v. - Highlight(ms[v.selectedMessage].ID.String()). + Highlight(ms[v.selected].ID.String()). ScrollToHighlight() return nil } func (v *MessagesView) selectLastMessage(ms []discord.Message) *tcell.EventKey { - v.selectedMessage = 0 + v.selected = 0 v. - Highlight(ms[v.selectedMessage].ID.String()). + Highlight(ms[v.selected].ID.String()). ScrollToHighlight() return nil }