slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ui: accounts, register: more stable scroll position after E/C/R

Browse Source
This commit is contained in:
Simon Michael 2016-06-03 17:53:49 -07:00
parent 98cbcced57
commit 9e42e231c7
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hledger-ui/Hledger/UI/AccountsScreen.hs
View File

@ -260,15 +260,15 @@ handleAccountsScreen st@AppState{
Vty.EvKey (Vty.KChar '9') [] -> continue $ reload j d $ setDepth 9 st' Vty.EvKey (Vty.KChar '9') [] -> continue $ reload j d $ setDepth 9 st'
Vty.EvKey (Vty.KChar '0') [] -> continue $ reload j d $ setDepth 0 st' Vty.EvKey (Vty.KChar '0') [] -> continue $ reload j d $ setDepth 0 st'
Vty.EvKey (Vty.KChar 'F') [] -> continue $ reload j d $ stToggleFlat st' Vty.EvKey (Vty.KChar 'F') [] -> continue $ reload j d $ stToggleFlat st'
Vty.EvKey (Vty.KChar 'E') [] -> continue $ reload j d $ stToggleEmpty st' Vty.EvKey (Vty.KChar 'E') [] -> scrollTop >> (continue $ reload j d $ stToggleEmpty st')
Vty.EvKey (Vty.KChar 'C') [] -> continue $ reload j d $ stToggleCleared st' Vty.EvKey (Vty.KChar 'C') [] -> scrollTop >> (continue $ reload j d $ stToggleCleared st')
Vty.EvKey (Vty.KChar 'R') [] -> continue $ reload j d $ stToggleReal st' Vty.EvKey (Vty.KChar 'R') [] -> scrollTop >> (continue $ reload j d $ stToggleReal st')
Vty.EvKey (Vty.KLeft) [] -> continue $ popScreen st' Vty.EvKey (Vty.KLeft) [] -> continue $ popScreen st'
Vty.EvKey (k) [] | k `elem` [Vty.KRight, Vty.KEnter] -> do Vty.EvKey (k) [] | k `elem` [Vty.KRight, Vty.KEnter] -> do
let let
scr = RS.rsSetCurrentAccount selacct' RS.screen scr = RS.rsSetCurrentAccount selacct' RS.screen
st'' = screenEnter d scr st' st'' = screenEnter d scr st'
vScrollToBeginning $ viewportScroll "register" scrollTopRegister
continue st'' continue st''
-- fall through to the list's event handler (handles up/down) -- fall through to the list's event handler (handles up/down)
@ -276,6 +276,15 @@ handleAccountsScreen st@AppState{
l' <- handleEvent ev l l' <- handleEvent ev l
continue $ st'{aScreen=scr{asState=(l',selacct')}} continue $ st'{aScreen=scr{asState=(l',selacct')}}
-- continue =<< handleEventLensed st' someLens ev -- continue =<< handleEventLensed st' someLens ev
where
-- Encourage a more stable scroll position when toggling list items.
-- We scroll to the top, and the viewport will automatically
-- scroll down just far enough to reveal the selection, which
-- usually leaves it at bottom of screen).
-- XXX better: scroll so selection is in middle of screen ?
scrollTop = vScrollToBeginning $ viewportScroll "accounts"
scrollTopRegister = vScrollToBeginning $ viewportScroll "register"
handleAccountsScreen _ _ = error "event handler called with wrong screen type, should not happen" handleAccountsScreen _ _ = error "event handler called with wrong screen type, should not happen"
-- | Get the maximum account depth in the current journal. -- | Get the maximum account depth in the current journal.

16
hledger-ui/Hledger/UI/RegisterScreen.hs
View File

@ -220,16 +220,9 @@ handleRegisterScreen st@AppState{
Right j' -> continue $ reload j' d st Right j' -> continue $ reload j' d st
Left err -> continue $ screenEnter d ES.screen{esState=err} st Left err -> continue $ screenEnter d ES.screen{esState=err} st
Vty.EvKey (Vty.KChar 'E') [] -> do Vty.EvKey (Vty.KChar 'E') [] -> scrollTop >> (continue $ reload j d $ stToggleEmpty st)
-- encourage a more stable scroll position when toggling items. Vty.EvKey (Vty.KChar 'C') [] -> scrollTop >> (continue $ reload j d $ stToggleCleared st)
-- We scroll to the beginning, then the viewport automatically Vty.EvKey (Vty.KChar 'R') [] -> scrollTop >> (continue $ reload j d $ stToggleReal st)
-- scrolls down just far enough to reveal the selection.
vScrollToBeginning $ viewportScroll "register"
continue $ reload j d $ stToggleEmpty st
Vty.EvKey (Vty.KChar 'C') [] -> continue $ reload j d $ stToggleCleared st
Vty.EvKey (Vty.KChar 'R') [] -> continue $ reload j d $ stToggleReal st
Vty.EvKey (Vty.KLeft) [] -> continue $ popScreen st Vty.EvKey (Vty.KLeft) [] -> continue $ popScreen st
Vty.EvKey (k) [] | k `elem` [Vty.KRight, Vty.KEnter] -> do Vty.EvKey (k) [] | k `elem` [Vty.KRight, Vty.KEnter] -> do
@ -248,5 +241,8 @@ handleRegisterScreen st@AppState{
l' <- handleEvent ev l l' <- handleEvent ev l
continue st{aScreen=s{rsState=(l',acct)}} continue st{aScreen=s{rsState=(l',acct)}}
-- continue =<< handleEventLensed st someLens ev -- continue =<< handleEventLensed st someLens ev
where
-- Encourage a more stable scroll position when toggling list items (cf AccountsScreen.hs)
scrollTop = vScrollToBeginning $ viewportScroll "register"
handleRegisterScreen _ _ = error "event handler called with wrong screen type, should not happen" handleRegisterScreen _ _ = error "event handler called with wrong screen type, should not happen"