simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-11-09 00:15:48 +03:00
Code Issues Projects Releases Wiki Activity

ui: accounts: hold selection better during F toggle

Browse Source
This commit is contained in:
Simon Michael 2016-06-03 16:31:53 -07:00
parent ddf18060ab
commit 4ab1536ea0
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,21 +52,22 @@ initAccountsScreen :: Day -> AppState -> AppState
initAccountsScreen d st@AppState{
aopts=uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}},
ajournal=j,
aScreen=s@AccountsScreen{asState=(_,selacct)}
aScreen=s@AccountsScreen{asState=(oldl,selacct)}
} =
st{aopts=uopts', aScreen=s{asState=(l',selacct)}}
st{aopts=uopts', aScreen=s{asState=(newl',selacct)}}
where
l = list (Name "accounts") (V.fromList displayitems) 1
newl = list (Name "accounts") (V.fromList displayitems) 1
-- keep the selection near the last known selected account if possible
l' | T.null selacct = l
| otherwise = maybe l (flip listMoveTo l) midx
-- keep the selection near the last selected account
-- (may need to move to the next leaf account when entering flat mode)
newl' = listMoveTo selidx newl
where
midx = findIndex (\((a,_,_),_) -> a==selacctclipped) items
selacctclipped = case depth_ ropts of
Nothing -> selacct
Just d -> clipAccountName d selacct
selidx = case listSelectedElement oldl of
Nothing -> 0
Just (_,(_,a,_,_)) -> fromMaybe (fromMaybe 0 mprefixmatch) mexactmatch
where
mexactmatch = findIndex ((a ==) . second4) displayitems
mprefixmatch = findIndex ((a `isAccountNamePrefixOf`) . second4) displayitems
uopts' = uopts{cliopts_=copts{reportopts_=ropts'}}
ropts' = ropts {
-- XXX balanceReport doesn't respect this yet