From e62f62f0b35eac354e2e679abba78184e285792b Mon Sep 17 00:00:00 2001 From: ayn2op Date: Tue, 17 Feb 2026 00:07:12 -0500 Subject: [PATCH] feat(ui/chat): add scrollbar support --- go.mod | 18 +++++------ go.sum | 36 +++++++++++----------- internal/config/config.toml | 9 +++++- internal/config/theme.go | 48 +++++++++++++++++++++++++++++ internal/ui/chat/channels_picker.go | 5 +++ internal/ui/chat/messages_list.go | 5 +++ pkg/picker/picker.go | 10 ++++++ 7 files changed, 103 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index f1befc2..d4e12cf 100644 --- a/go.mod +++ b/go.mod @@ -8,16 +8,16 @@ require ( github.com/BurntSushi/toml v1.6.0 github.com/alecthomas/chroma/v2 v2.23.1 github.com/andybalholm/brotli v1.2.0 - github.com/ayn2op/tview v0.0.0-20260208071935-3324c648db69 + github.com/ayn2op/tview v0.0.0-20260217050221-5431d879e14f github.com/deckarep/gosx-notifier v0.0.0-20180201035817-e127226297fb - github.com/diamondburned/arikawa/v3 v3.6.1-0.20250928004212-a891a653eb26 + github.com/diamondburned/arikawa/v3 v3.6.1-0.20260216052616-fcce349c9c59 github.com/diamondburned/ningen/v3 v3.0.1-0.20250920191746-98fbd92e134d github.com/gdamore/tcell/v3 v3.1.2 github.com/gen2brain/beeep v0.11.2 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 - github.com/klauspost/compress v1.18.3 + github.com/klauspost/compress v1.18.4 github.com/ncruces/zenity v0.10.14 github.com/sahilm/fuzzy v0.1.1 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e @@ -51,11 +51,11 @@ require ( github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect github.com/twmb/murmur3 v1.1.8 // indirect go4.org v0.0.0-20260112195520-a5071408f32f // indirect - golang.org/x/exp/shiny v0.0.0-20260112195511-716be5621a96 // indirect - golang.org/x/image v0.35.0 // indirect - golang.org/x/mobile v0.0.0-20260204172633-1dceadbbeea3 // indirect - golang.org/x/sys v0.40.0 // indirect - golang.org/x/term v0.39.0 // indirect - golang.org/x/text v0.33.0 // indirect + golang.org/x/exp/shiny v0.0.0-20260212183809-81e46e3db34a // indirect + golang.org/x/image v0.36.0 // indirect + golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864 // indirect + golang.org/x/sys v0.41.0 // indirect + golang.org/x/term v0.40.0 // indirect + golang.org/x/text v0.34.0 // indirect golang.org/x/time v0.14.0 // indirect ) diff --git a/go.sum b/go.sum index 22cbc06..c98f485 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ= github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= -github.com/ayn2op/tview v0.0.0-20260208071935-3324c648db69 h1:DU0vNRmldUajM4tY5feFG/WsxaLhiPUHuWaQotmCLH8= -github.com/ayn2op/tview v0.0.0-20260208071935-3324c648db69/go.mod h1:g6IOdF9SlnVZMDnRABANP8I0LFseKyYxWqEkzBSL5ho= +github.com/ayn2op/tview v0.0.0-20260217050221-5431d879e14f h1:uRMzAVw6E7Wjs3o/H6wx9ZH++a9eGJY65kXZwZWCdQw= +github.com/ayn2op/tview v0.0.0-20260217050221-5431d879e14f/go.mod h1:g6IOdF9SlnVZMDnRABANP8I0LFseKyYxWqEkzBSL5ho= github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ= github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -25,8 +25,8 @@ github.com/dchest/jsmin v1.0.0 h1:Y2hWXmGZiRxtl+VcTksyucgTlYxnhPzTozCwx9gy9zI= github.com/dchest/jsmin v1.0.0/go.mod h1:AVBIund7Mr7lKXT70hKT2YgL3XEXUaUk5iw9DZ8b0Uc= github.com/deckarep/gosx-notifier v0.0.0-20180201035817-e127226297fb h1:6S+TKObz6+Io2c8IOkcbK4Sz7nj6RpEVU7TkvmsZZcw= github.com/deckarep/gosx-notifier v0.0.0-20180201035817-e127226297fb/go.mod h1:wf3nKtOnQqCp7kp9xB7hHnNlZ6m3NoiOxjrB9hFRq4Y= -github.com/diamondburned/arikawa/v3 v3.6.1-0.20250928004212-a891a653eb26 h1:B6Kna0iznIlJocfHQENuMTajtKjaBUyTLo2zeB/ipgY= -github.com/diamondburned/arikawa/v3 v3.6.1-0.20250928004212-a891a653eb26/go.mod h1:thocAM2X8lRDHuEZR5vWYaT4w+tb/vOKa1qm+r0gs5A= +github.com/diamondburned/arikawa/v3 v3.6.1-0.20260216052616-fcce349c9c59 h1:Ua4Rl0sKqj3CSqe3MpDQ44426Avj6knp+LNMIccpPb8= +github.com/diamondburned/arikawa/v3 v3.6.1-0.20260216052616-fcce349c9c59/go.mod h1:TpV2GvCJIYSwAXUEAx4sutPcftyAbVidiFlG6l7K0go= github.com/diamondburned/ningen/v3 v3.0.1-0.20250920191746-98fbd92e134d h1:wS6HWl86RFItw38sUSdXlulj0VarV4G+9Rlv8j+p3oQ= github.com/diamondburned/ningen/v3 v3.0.1-0.20250920191746-98fbd92e134d/go.mod h1:9PWnJlArEASrZQI89KQiBJBYOEDcsDyfhFcxRTL8eO4= github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= @@ -60,8 +60,8 @@ github.com/jackmordaunt/icns/v3 v3.0.1 h1:xxot6aNuGrU+lNgxz5I5H0qSeCjNKp8uTXB1j8 github.com/jackmordaunt/icns/v3 v3.0.1/go.mod h1:5sHL59nqTd2ynTnowxB/MDQFhKNqkK8X687uKNygaSQ= github.com/josephspurrier/goversioninfo v1.5.0 h1:9TJtORoyf4YMoWSOo/cXFN9A/lB3PniJ91OxIH6e7Zg= github.com/josephspurrier/goversioninfo v1.5.0/go.mod h1:6MoTvFZ6GKJkzcdLnU5T/RGYUbHQbKpYeNP0AgQLd2o= -github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+/6zw= -github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c= +github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag= @@ -117,12 +117,12 @@ golang.design/x/clipboard v0.7.1 h1:OEG3CmcYRBNnRwpDp7+uWLiZi3hrMRJpE9JkkkYtz2c= golang.design/x/clipboard v0.7.1/go.mod h1:i5SiIqj0wLFw9P/1D7vfILFK0KHMk7ydE72HRrUIgkg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/exp/shiny v0.0.0-20260112195511-716be5621a96 h1:wJ3cDLvYRAWzRt6f3e2VwVlziH3httfx2PGMa8hqqWo= -golang.org/x/exp/shiny v0.0.0-20260112195511-716be5621a96/go.mod h1:hq/Ge0xSczE7aHicXVhn3Kd0j3hOtWQR4KEgAwemgdk= -golang.org/x/image v0.35.0 h1:LKjiHdgMtO8z7Fh18nGY6KDcoEtVfsgLDPeLyguqb7I= -golang.org/x/image v0.35.0/go.mod h1:MwPLTVgvxSASsxdLzKrl8BRFuyqMyGhLwmC+TO1Sybk= -golang.org/x/mobile v0.0.0-20260204172633-1dceadbbeea3 h1:NiJtT7g4ncNFVjVZMAYNBrPSNhIjFYPj8UKA8MEw2A4= -golang.org/x/mobile v0.0.0-20260204172633-1dceadbbeea3/go.mod h1:wReH3Q1agKmmLapipWFnd4NSs8KPz3fK6mSEZjXLkrg= +golang.org/x/exp/shiny v0.0.0-20260212183809-81e46e3db34a h1:pCkykR/N0jWVZoY0vl/3zjgys3YxHlrcTlJ/xL9ZMps= +golang.org/x/exp/shiny v0.0.0-20260212183809-81e46e3db34a/go.mod h1:zxsA7NyDTOUjcveVwAMFI/YIErWwayTW/4RGqB/RzKk= +golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc= +golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4= +golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864 h1:cTVynMSsMYgbUrtia2HB1jrhdUwQNtQti91vUCyjMp4= +golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864/go.mod h1:4OGHIUSBiIqyFAQDaX1tpY0BVnO20DvNDeATBu8aeFQ= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -139,20 +139,20 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= +golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY= -golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww= +golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= +golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= -golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= +golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= +golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/internal/config/config.toml b/internal/config/config.toml index f10f7ca..604dca6 100644 --- a/internal/config/config.toml +++ b/internal/config/config.toml @@ -156,7 +156,7 @@ bottom = "End" # style = { foreground = "", background = "", attributes = "" or [""] } [theme.title] -alignment = "left" # `"left"`, `"center"`, or `"right"`. +alignment = "left" # `"left"`, `"center"`, or `"right"`. normal_style = { attributes = "dim" } active_style = { foreground = "green", attributes = "bold" } @@ -182,6 +182,13 @@ auto_expand_folders = true graphics = true graphics_color = "default" +[theme.scroll_bar] +visibility = "auto" +# "minimal", "box_drawing", or "unicode" +glyph_set = "unicode" +track_style = { attributes = "dim" } +thumb_style = {} + [theme.messages_list] reply_indicator = ">" forwarded_indicator = "<" diff --git a/internal/config/theme.go b/internal/config/theme.go index b2de98c..6970673 100644 --- a/internal/config/theme.go +++ b/internal/config/theme.go @@ -107,6 +107,46 @@ func (bw *BorderSetWrapper) UnmarshalTOML(val any) error { return nil } +type GlyphSetWrapper struct{ tview.GlyphSet } + +func (gw *GlyphSetWrapper) UnmarshalTOML(val any) error { + s, ok := val.(string) + if !ok { + return errInvalidType + } + + switch s { + case "minimal": + gw.GlyphSet = tview.MinimalGlyphSet() + case "box_drawing", "boxdrawing", "box": + gw.GlyphSet = tview.BoxDrawingGlyphSet() + case "unicode": + gw.GlyphSet = tview.UnicodeGlyphSet() + } + + return nil +} + +type ScrollBarVisibilityWrapper struct{ tview.ScrollBarVisibility } + +func (vw *ScrollBarVisibilityWrapper) UnmarshalTOML(val any) error { + s, ok := val.(string) + if !ok { + return errInvalidType + } + + switch s { + case "automatic", "auto": + vw.ScrollBarVisibility = tview.ScrollBarVisibilityAutomatic + case "always": + vw.ScrollBarVisibility = tview.ScrollBarVisibilityAlways + case "never", "hidden", "off": + vw.ScrollBarVisibility = tview.ScrollBarVisibilityNever + } + + return nil +} + type ( ThemeStyle struct { NormalStyle StyleWrapper `toml:"normal_style"` @@ -161,11 +201,19 @@ type ( BackgroundStyle StyleWrapper `toml:"background_style"` } + ScrollBarTheme struct { + Visibility ScrollBarVisibilityWrapper `toml:"visibility"` + GlyphSet GlyphSetWrapper `toml:"glyph_set"` + TrackStyle StyleWrapper `toml:"track_style"` + ThumbStyle StyleWrapper `toml:"thumb_style"` + } + Theme struct { Title TitleTheme `toml:"title"` Footer FooterTheme `toml:"footer"` Border BorderTheme `toml:"border"` GuildsTree GuildsTreeTheme `toml:"guilds_tree"` + ScrollBar ScrollBarTheme `toml:"scroll_bar"` MessagesList MessagesListTheme `toml:"messages_list"` MentionsList MentionsListTheme `toml:"mentions_list"` Dialog DialogTheme `toml:"dialog"` diff --git a/internal/ui/chat/channels_picker.go b/internal/ui/chat/channels_picker.go index d25cbe0..7674930 100644 --- a/internal/ui/chat/channels_picker.go +++ b/internal/ui/chat/channels_picker.go @@ -30,6 +30,11 @@ func newChannelsPicker(cfg *config.Config, chatView *View) *channelsPicker { cp.SetSelectedFunc(cp.onSelected) cp.SetTitle("Channels") + cp.SetScrollBarVisibility(cfg.Theme.ScrollBar.Visibility.ScrollBarVisibility) + cp.SetScrollBar(tview.NewScrollBar(). + SetTrackStyle(cfg.Theme.ScrollBar.TrackStyle.Style). + SetThumbStyle(cfg.Theme.ScrollBar.ThumbStyle.Style). + SetGlyphSet(cfg.Theme.ScrollBar.GlyphSet.GlyphSet)) cp.SetKeyMap(&picker.KeyMap{ Cancel: cfg.Keybinds.Picker.Cancel, Up: cfg.Keybinds.Picker.Up, diff --git a/internal/ui/chat/messages_list.go b/internal/ui/chat/messages_list.go index 1d4915f..ba11dbb 100644 --- a/internal/ui/chat/messages_list.go +++ b/internal/ui/chat/messages_list.go @@ -85,6 +85,11 @@ func newMessagesList(cfg *config.Config, chatView *View) *messagesList { ml.SetBuilder(ml.buildItem) ml.SetChangedFunc(ml.onRowCursorChanged) ml.SetTrackEnd(true) + ml.SetScrollBarVisibility(cfg.Theme.ScrollBar.Visibility.ScrollBarVisibility) + ml.SetScrollBar(tview.NewScrollBar(). + SetTrackStyle(cfg.Theme.ScrollBar.TrackStyle.Style). + SetThumbStyle(cfg.Theme.ScrollBar.ThumbStyle.Style). + SetGlyphSet(cfg.Theme.ScrollBar.GlyphSet.GlyphSet)) ml.SetInputCapture(ml.onInputCapture) return ml } diff --git a/pkg/picker/picker.go b/pkg/picker/picker.go index 860fd3e..b5eca81 100644 --- a/pkg/picker/picker.go +++ b/pkg/picker/picker.go @@ -85,6 +85,16 @@ func (p *Picker) SetKeyMap(keyMap *KeyMap) { p.keyMap = keyMap } +// SetScrollBarVisibility sets when the picker's list scrollBar is rendered. +func (p *Picker) SetScrollBarVisibility(visibility tview.ScrollBarVisibility) { + p.list.SetScrollBarVisibility(visibility) +} + +// SetScrollBar sets the scrollBar primitive used by the picker's list. +func (p *Picker) SetScrollBar(scrollBar *tview.ScrollBar) { + p.list.SetScrollBar(scrollBar) +} + func (p *Picker) SetSelectedFunc(onSelected SelectedFunc) { p.onSelected = onSelected }