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

Show multiline errors in login view

Browse Source
This commit is contained in:
Tulir Asokan 2020-02-19 22:13:02 +02:00
parent 257eaa077a
commit 417bf25373
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ui/view-login.go
View File

@ -17,6 +17,8 @@
package ui package ui
import ( import (
"math"
"maunium.net/go/tcell" "maunium.net/go/tcell"
"maunium.net/go/mautrix" "maunium.net/go/mautrix"
@ -39,7 +41,7 @@ type LoginView struct {
homeserver *mauview.InputField homeserver *mauview.InputField
username *mauview.InputField username *mauview.InputField
password *mauview.InputField password *mauview.InputField
error *mauview.TextField error *mauview.TextView
loginButton *mauview.Button loginButton *mauview.Button
quitButton *mauview.Button quitButton *mauview.Button
@ -80,7 +82,7 @@ func (ui *GomuksUI) NewLoginView() mauview.Component {
view.loginButton.SetOnClick(view.Login).SetBackgroundColor(tcell.ColorDarkCyan) view.loginButton.SetOnClick(view.Login).SetBackgroundColor(tcell.ColorDarkCyan)
view.SetColumns([]int{1, 10, 1, 9, 1, 9, 1, 10, 1}) view.SetColumns([]int{1, 10, 1, 9, 1, 9, 1, 10, 1})
view.SetRows([]int{1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) view.SetRows([]int{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})
view.AddFormItem(view.username, 3, 1, 5, 1). view.AddFormItem(view.username, 3, 1, 5, 1).
AddFormItem(view.password, 3, 3, 5, 1). AddFormItem(view.password, 3, 3, 5, 1).
AddFormItem(view.homeserver, 3, 5, 5, 1). AddFormItem(view.homeserver, 3, 5, 5, 1).
@ -92,24 +94,29 @@ func (ui *GomuksUI) NewLoginView() mauview.Component {
view.FocusNextItem() view.FocusNextItem()
ui.loginView = view ui.loginView = view
view.container = mauview.Center(mauview.NewBox(view).SetTitle("Log in to Matrix"), 45, 13) view.container = mauview.Center(mauview.NewBox(view).SetTitle("Log in to Matrix"), 45, 11)
view.container.SetAlwaysFocusChild(true) view.container.SetAlwaysFocusChild(true)
return view.container return view.container
} }
func (view *LoginView) Error(err string) { func (view *LoginView) Error(err string) {
if len(err) == 0 { if len(err) == 0 && view.error != nil {
debug.Print("Hiding error") debug.Print("Hiding error")
view.RemoveComponent(view.error) view.RemoveComponent(view.error)
view.container.SetHeight(11)
view.SetRows([]int{1, 1, 1, 1, 1, 1, 1, 1, 1})
view.error = nil view.error = nil
return } else if len(err) > 0 {
debug.Print("Showing error", err)
if view.error == nil {
view.error = mauview.NewTextView().SetTextColor(tcell.ColorRed)
view.AddComponent(view.error, 1, 9, 7, 1)
}
view.error.SetText(err)
errorHeight := int(math.Ceil(float64(mauview.StringWidth(err)) / 45))
view.container.SetHeight(12 + errorHeight)
view.SetRow(9, errorHeight)
} }
debug.Print("Showing error", err)
if view.error == nil {
view.error = mauview.NewTextField().SetTextColor(tcell.ColorRed)
view.AddComponent(view.error, 1, 9, 7, 1)
}
view.error.SetText(err)
view.parent.Render() view.parent.Render()
} }