From 3f01535cdf1f680d2b408c1e763e11847fc63c04 Mon Sep 17 00:00:00 2001 From: FIGBERT Date: Tue, 7 Mar 2023 23:06:02 -0800 Subject: [PATCH] Render topic view in modern style --- ui/room-view.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/ui/room-view.go b/ui/room-view.go index 372ed40..bc5682e 100644 --- a/ui/room-view.go +++ b/ui/room-view.go @@ -131,9 +131,15 @@ func NewRoomView(parent *MainView, room *rooms.Room) *RoomView { view.input.SetPlaceholder("Send an encrypted message...") } - view.topic. - SetTextColor(tcell.ColorWhite). - SetBackgroundColor(tcell.ColorDarkGreen) + if view.config.Preferences.DisplayMode != config.DisplayModeModern { + view.topic. + SetTextColor(tcell.ColorWhite). + SetBackgroundColor(tcell.ColorDarkGreen) + } else { + view.topic. + SetTextColor(tcell.ColorDefault). + SetTextAlign(mauview.AlignCenter) + } view.status.SetBackgroundColor(tcell.ColorDimGray) @@ -333,6 +339,9 @@ func (view *RoomView) Draw(screen mauview.Screen) { view.ulBorder.Draw(view.ulBorderScreen) view.userList.Draw(view.ulScreen) } + if view.config.Preferences.DisplayMode == config.DisplayModeModern { + widget.NewBorder().Draw(mauview.NewProxyScreen(view.topicScreen, 2, 1, view.topicScreen.Width-5, 1)) + } } func (view *RoomView) ClearAllContext() { @@ -864,7 +873,9 @@ func (view *RoomView) MxRoom() *rooms.Room { func (view *RoomView) Update() { topicStr := strings.TrimSpace(strings.ReplaceAll(view.Room.GetTopic(), "\n", " ")) - if view.config.Preferences.HideRoomList || view.config.Preferences.DisplayMode == config.DisplayModeModern { + if view.config.Preferences.DisplayMode == config.DisplayModeModern { + topicStr = view.Room.GetTitle() + } else if view.config.Preferences.HideRoomList { if len(topicStr) > 0 { topicStr = fmt.Sprintf("%s - %s", view.Room.GetTitle(), topicStr) } else {