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

Merge remote-tracking branch 'zavok/master'

Browse Source
This commit is contained in:
Tulir Asokan 2021-08-02 21:48:27 +03:00
commit 6d8b34db09
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/fuzzy-search-modal.go
View File

@ -58,7 +58,7 @@ func NewFuzzySearchModal(mainView *MainView, width int, height int) *FuzzySearch
fs.results = mauview.NewTextView().SetRegions(true) fs.results = mauview.NewTextView().SetRegions(true)
fs.search = mauview.NewInputArea(). fs.search = mauview.NewInputArea().
SetChangedFunc(fs.changeHandler). SetChangedFunc(fs.changeHandler).
SetTextColor(tcell.ColorWhite). SetTextColor(tcell.ColorDefault).
SetBackgroundColor(tcell.ColorDarkCyan) SetBackgroundColor(tcell.ColorDarkCyan)
fs.search.Focus() fs.search.Focus()

3
ui/help-modal.go
View File

@ -76,7 +76,8 @@ func NewHelpModal(parent *MainView) *HelpModal {
text := mauview.NewTextView(). text := mauview.NewTextView().
SetText(helpText). SetText(helpText).
SetScrollable(true). SetScrollable(true).
SetWrap(false) SetWrap(false).
SetTextColor(tcell.ColorDefault)
box := mauview.NewBox(text). box := mauview.NewBox(text).
SetBorder(true). SetBorder(true).

2
ui/member-list.go
View File

@ -107,7 +107,7 @@ func (ml *MemberList) Update(data map[id.UserID]*rooms.Member, levels *event.Pow
func (ml *MemberList) Draw(screen mauview.Screen) { func (ml *MemberList) Draw(screen mauview.Screen) {
width, _ := screen.Size() width, _ := screen.Size()
sigilStyle := tcell.StyleDefault.Background(tcell.ColorGreen).Foreground(tcell.ColorWhite) sigilStyle := tcell.StyleDefault.Background(tcell.ColorGreen).Foreground(tcell.ColorDefault)
for y, member := range ml.list { for y, member := range ml.list {
if member.Sigil != ' ' { if member.Sigil != ' ' {
screen.SetCell(0, y, sigilStyle, member.Sigil) screen.SetCell(0, y, sigilStyle, member.Sigil)

4
ui/room-list.go
View File

@ -96,8 +96,8 @@ func NewRoomList(parent *MainView) *RoomList {
scrollOffset: 0, scrollOffset: 0,
mainTextColor: tcell.ColorWhite, mainTextColor: tcell.ColorDefault,
selectedTextColor: tcell.ColorWhite, selectedTextColor: tcell.ColorDefault,
selectedBackgroundColor: tcell.ColorDarkGreen, selectedBackgroundColor: tcell.ColorDarkGreen,
} }
for _, tag := range list.tags { for _, tag := range list.tags {

3
ui/room-view.go
View File

@ -117,6 +117,7 @@ func NewRoomView(parent *MainView, room *rooms.Room) *RoomView {
view.Room.SetPostLoad(view.loadTyping) view.Room.SetPostLoad(view.loadTyping)
view.input. view.input.
SetTextColor(tcell.ColorDefault).
SetBackgroundColor(tcell.ColorDefault). SetBackgroundColor(tcell.ColorDefault).
SetPlaceholder("Send a message..."). SetPlaceholder("Send a message...").
SetPlaceholderTextColor(tcell.ColorGray). SetPlaceholderTextColor(tcell.ColorGray).
@ -129,7 +130,7 @@ func NewRoomView(parent *MainView, room *rooms.Room) *RoomView {
} }
view.topic. view.topic.
SetTextColor(tcell.ColorWhite). SetTextColor(tcell.ColorDefault).
SetBackgroundColor(tcell.ColorDarkGreen) SetBackgroundColor(tcell.ColorDarkGreen)
view.status.SetBackgroundColor(tcell.ColorDimGray) view.status.SetBackgroundColor(tcell.ColorDimGray)

4
ui/verification-modal.go
View File

@ -106,7 +106,7 @@ func NewVerificationModal(mainView *MainView, device *crypto.DeviceIdentity, tim
vm.inputBar = mauview.NewInputField(). vm.inputBar = mauview.NewInputField().
SetBackgroundColor(tcell.ColorDefault). SetBackgroundColor(tcell.ColorDefault).
SetPlaceholderTextColor(tcell.ColorWhite) SetPlaceholderTextColor(tcell.ColorDefault)
flex := mauview.NewFlex(). flex := mauview.NewFlex().
SetDirection(mauview.FlexRow). SetDirection(mauview.FlexRow).
@ -163,7 +163,7 @@ func (vm *VerificationModal) VerifySASMatch(device *crypto.DeviceIdentity, data
"same %s as below, then type \"yes\" to\n"+ "same %s as below, then type \"yes\" to\n"+
"accept, or \"no\" to reject", typeName)) "accept, or \"no\" to reject", typeName))
vm.inputBar. vm.inputBar.
SetTextColor(tcell.ColorWhite). SetTextColor(tcell.ColorDefault).
SetBackgroundColor(tcell.ColorDarkCyan). SetBackgroundColor(tcell.ColorDarkCyan).
SetPlaceholder("Type \"yes\" or \"no\""). SetPlaceholder("Type \"yes\" or \"no\"").
Focus() Focus()