From 686f7025cb741933bac63e850f94ee28611436c2 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 6 Mar 2022 22:34:24 +0200 Subject: [PATCH] Add room name to topic bar if room list is hidden. Closes #317 --- ui/commands.go | 4 ++++ ui/room-view.go | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ui/commands.go b/ui/commands.go index d8f47bb..97d9ad0 100644 --- a/ui/commands.go +++ b/ui/commands.go @@ -845,6 +845,10 @@ func cmdToggle(cmd *Command) { *val = !(*val) debug.Print(thing, *val) cmd.Reply(toggleMsg[thing].Format(*val)) + if thing == "rooms" { + // Update topic string to include or not include room name + cmd.Room.Update() + } } cmd.UI.Render() go cmd.Matrix.SendPreferencesToMatrix() diff --git a/ui/room-view.go b/ui/room-view.go index dd0e25b..8d47ae0 100644 --- a/ui/room-view.go +++ b/ui/room-view.go @@ -836,7 +836,16 @@ func (view *RoomView) MxRoom() *rooms.Room { } func (view *RoomView) Update() { - view.topic.SetText(strings.Replace(view.Room.GetTopic(), "\n", " ", -1)) + topicStr := strings.TrimSpace(strings.ReplaceAll(view.Room.GetTopic(), "\n", " ")) + if view.config.Preferences.HideRoomList { + if len(topicStr) > 0 { + topicStr = fmt.Sprintf("%s - %s", view.Room.GetTitle(), topicStr) + } else { + topicStr = view.Room.GetTitle() + } + topicStr = strings.TrimSpace(topicStr) + } + view.topic.SetText(topicStr) if !view.userListLoaded { view.UpdateUserList() }