From 8346f65e3dd707db8b294e6d2e3a9f95bcbfb54a Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 30 Apr 2018 12:50:12 +0300 Subject: Fix autoscrolling in room list when using keyboard. Fixes #34 --- ui/room-list.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/room-list.go b/ui/room-list.go index 3a43872..03d9862 100644 --- a/ui/room-list.go +++ b/ui/room-list.go @@ -223,9 +223,10 @@ func (list *RoomList) SetSelected(tag string, room *rooms.Room) { list.selectedTag = tag pos := list.index(tag, room) _, _, _, height := list.GetRect() - if pos < list.scrollOffset || pos > list.scrollOffset+height { - // TODO this does weird stuff sometimes, needs to be fixed - //list.scrollOffset = pos + if pos <= list.scrollOffset { + list.scrollOffset = pos-1 + } else if pos >= list.scrollOffset+height { + list.scrollOffset = pos-height+1 } debug.Print("Selecting", room.GetTitle(), "in", list.GetTagDisplayName(tag)) } @@ -358,6 +359,7 @@ func (list *RoomList) index(tag string, room *rooms.Room) int { if localIndex == -1 { return -1 } + localIndex = len(list.items[tag]) - 1 - localIndex // Tag header localIndex += 1 -- cgit v1.2.3