Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minor issues

Browse Source
This commit is contained in:
Tulir Asokan 2020-03-01 01:05:00 +02:00
parent 9d132d328b
commit 6b29d90fb4
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -19,7 +19,7 @@ require (
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 golang.org/x/net v0.0.0-20200202094626-16171245cfb2
gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2 gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
gopkg.in/yaml.v2 v2.2.8 gopkg.in/yaml.v2 v2.2.8
maunium.net/go/mautrix v0.1.0-alpha.3.0.20200229222711-57beb97fdccb maunium.net/go/mautrix v0.1.0-alpha.3.0.20200229230354-be576ef8fcb1
maunium.net/go/mauview v0.0.0-20200220222850-39f1414676d9 maunium.net/go/mauview v0.0.0-20200220222850-39f1414676d9
maunium.net/go/tcell v1.1.2-0.20200218183045-87c4a25c5b09 maunium.net/go/tcell v1.1.2-0.20200218183045-87c4a25c5b09
) )

2
go.sum
View File

@ -88,6 +88,8 @@ maunium.net/go/mautrix v0.1.0-alpha.3.0.20200221234248-8a868bce2854 h1:NKj52IqLk
maunium.net/go/mautrix v0.1.0-alpha.3.0.20200221234248-8a868bce2854/go.mod h1:g10T1fh2Q2HkJWycVs93eBXdWpqD67f1YVQhNxdIDr4= maunium.net/go/mautrix v0.1.0-alpha.3.0.20200221234248-8a868bce2854/go.mod h1:g10T1fh2Q2HkJWycVs93eBXdWpqD67f1YVQhNxdIDr4=
maunium.net/go/mautrix v0.1.0-alpha.3.0.20200229222711-57beb97fdccb h1:b9cMiQ85HtNhV/gItnjdEFC7nQTWmvnALiHQiYqrJAU= maunium.net/go/mautrix v0.1.0-alpha.3.0.20200229222711-57beb97fdccb h1:b9cMiQ85HtNhV/gItnjdEFC7nQTWmvnALiHQiYqrJAU=
maunium.net/go/mautrix v0.1.0-alpha.3.0.20200229222711-57beb97fdccb/go.mod h1:g10T1fh2Q2HkJWycVs93eBXdWpqD67f1YVQhNxdIDr4= maunium.net/go/mautrix v0.1.0-alpha.3.0.20200229222711-57beb97fdccb/go.mod h1:g10T1fh2Q2HkJWycVs93eBXdWpqD67f1YVQhNxdIDr4=
maunium.net/go/mautrix v0.1.0-alpha.3.0.20200229230354-be576ef8fcb1 h1:2XQfQNWeNhhEXrb2HgOpTi26o7qq17lQCwSl6wDz2WM=
maunium.net/go/mautrix v0.1.0-alpha.3.0.20200229230354-be576ef8fcb1/go.mod h1:g10T1fh2Q2HkJWycVs93eBXdWpqD67f1YVQhNxdIDr4=
maunium.net/go/mauview v0.0.0-20200218183549-88ecb1321176 h1:KoTm7ASEzFIZ1SvPWuWYzpkeA+wiR1fuUu4l7TCHcE0= maunium.net/go/mauview v0.0.0-20200218183549-88ecb1321176 h1:KoTm7ASEzFIZ1SvPWuWYzpkeA+wiR1fuUu4l7TCHcE0=
maunium.net/go/mauview v0.0.0-20200218183549-88ecb1321176/go.mod h1:jwg3Ow7akzsCX3q38pZAfmEC5gGN8gXwMyyjy/yZVMg= maunium.net/go/mauview v0.0.0-20200218183549-88ecb1321176/go.mod h1:jwg3Ow7akzsCX3q38pZAfmEC5gGN8gXwMyyjy/yZVMg=
maunium.net/go/mauview v0.0.0-20200218231215-04d01c601d5b h1:Bfov5IkJQpkqDexiFioHIZpx4XL7AILDA1GwLVdqtBw= maunium.net/go/mauview v0.0.0-20200218231215-04d01c601d5b h1:Bfov5IkJQpkqDexiFioHIZpx4XL7AILDA1GwLVdqtBw=

16
ui/room-view.go
View File

@ -188,7 +188,7 @@ func (view *RoomView) GetStatus() string {
buf.WriteString(view.replying.Sender) buf.WriteString(view.replying.Sender)
buf.WriteString(" - ") buf.WriteString(" - ")
} else if view.selecting { } else if view.selecting {
buf.WriteString("Selecting message to") buf.WriteString("Selecting message to ")
buf.WriteString(string(view.selectReason)) buf.WriteString(string(view.selectReason))
buf.WriteString(" - ") buf.WriteString(" - ")
} }
@ -280,9 +280,19 @@ func (view *RoomView) Draw(screen mauview.Screen) {
} }
} }
func (view *RoomView) ClearAllContext() {
view.MessageView().SetSelected(nil)
view.SetEditing(nil)
view.replying = nil
view.selecting = false
view.selectContent = ""
}
func (view *RoomView) OnKeyEvent(event mauview.KeyEvent) bool { func (view *RoomView) OnKeyEvent(event mauview.KeyEvent) bool {
msgView := view.MessageView() msgView := view.MessageView()
switch event.Key() { switch event.Key() {
case tcell.KeyEscape:
view.ClearAllContext()
case tcell.KeyPgUp: case tcell.KeyPgUp:
if msgView.IsAtTop() { if msgView.IsAtTop() {
go view.parent.LoadHistory(view.Room.ID) go view.parent.LoadHistory(view.Room.ID)
@ -510,7 +520,6 @@ func (view *RoomView) InputSubmit(text string) {
} }
view.editMoveText = "" view.editMoveText = ""
view.SetInputText("") view.SetInputText("")
view.MessageView().SetSelected(nil)
} }
func (view *RoomView) SendReaction(eventID string, reaction string) { func (view *RoomView) SendReaction(eventID string, reaction string) {
@ -562,8 +571,7 @@ func (view *RoomView) SendMessage(msgtype mautrix.MessageType, text string) {
evt := view.parent.matrix.PrepareMarkdownMessage(view.Room.ID, msgtype, text, rel) evt := view.parent.matrix.PrepareMarkdownMessage(view.Room.ID, msgtype, text, rel)
msg := view.parseEvent(evt.SomewhatDangerousCopy()) msg := view.parseEvent(evt.SomewhatDangerousCopy())
view.content.AddMessage(msg, AppendMessage) view.content.AddMessage(msg, AppendMessage)
view.editing = nil view.ClearAllContext()
view.replying = nil
view.status.SetText(view.GetStatus()) view.status.SetText(view.GetStatus())
eventID, err := view.parent.matrix.SendEvent(evt) eventID, err := view.parent.matrix.SendEvent(evt)
if err != nil { if err != nil {