From 7bbff6a3595fa12dbf250addd7d3cee1049d381b Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 18 Nov 2021 07:11:04 -1000 Subject: [PATCH] fix: ui: accounts: don't let j or C-n move past bottom --- hledger-ui/Hledger/UI/AccountsScreen.hs | 5 ++--- hledger-ui/Hledger/UI/RegisterScreen.hs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs index eebc0dc53..2a8d1b214 100644 --- a/hledger-ui/Hledger/UI/AccountsScreen.hs +++ b/hledger-ui/Hledger/UI/AccountsScreen.hs @@ -332,9 +332,8 @@ asHandle ui0@UIState{ asEnterRegister d clickedacct ui where clickedacct = maybe "" asItemAccountName $ listElements _asList !? y - -- prevent moving down over blank padding items; - -- instead scroll down by one, until maximally scrolled - shows the end has been reached - VtyEvent (EvKey (KDown) []) | isBlankElement mnextelement -> do + -- when selection is at the last item, DOWN scrolls instead of moving, until maximally scrolled + VtyEvent e | e `elem` moveDownEvents, isBlankElement mnextelement -> do vScrollBy (viewportScroll $ _asList^.listNameL) 1 >> continue ui where mnextelement = listSelectedElement $ listMoveDown _asList diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs index 46ff22eb6..91436e9a0 100644 --- a/hledger-ui/Hledger/UI/RegisterScreen.hs +++ b/hledger-ui/Hledger/UI/RegisterScreen.hs @@ -372,7 +372,7 @@ rsHandle ui@UIState{ continue $ screenEnter d transactionScreen{tsAccount=rsAccount} ui where clickeddate = maybe "" rsItemDate $ listElements rsList !? y - -- when at the last item, instead of moving down, scroll down by one, until maximally scrolled + -- when selection is at the last item, DOWN scrolls instead of moving, until maximally scrolled VtyEvent e | e `elem` moveDownEvents, isBlankElement mnextelement -> do vScrollBy (viewportScroll $ rsList ^. listNameL) 1 >> continue ui where mnextelement = listSelectedElement $ listMoveDown rsList