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

ui: register: fix width overflow from int division

Browse Source
This commit is contained in:
Simon Michael 2015-08-24 14:50:41 -07:00
parent e7aa150e52
commit efb3a154da
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hledger-ui/Hledger/UI/RegisterScreen2.hs
View File

@ -110,8 +110,8 @@ drawRegisterScreen2 AppState{aopts=_opts, aScreen=RegisterScreen2{rs2State=l}} =
maxamtswidth = max 0 (totalwidth - 21) maxamtswidth = max 0 (totalwidth - 21)
changewidth' = maximum' $ map (length . fourth5) displayitems changewidth' = maximum' $ map (length . fourth5) displayitems
balwidth' = maximum' $ map (length . fifth5) displayitems balwidth' = maximum' $ map (length . fifth5) displayitems
changewidthproportion = (changewidth' + balwidth') `div` changewidth' changewidthproportion = fromIntegral (changewidth' + balwidth') / fromIntegral changewidth'
maxchangewidth = maxamtswidth `div` changewidthproportion maxchangewidth = round $ fromIntegral maxamtswidth / changewidthproportion
maxbalwidth = maxamtswidth - maxchangewidth maxbalwidth = maxamtswidth - maxchangewidth
changewidth = min maxchangewidth changewidth' changewidth = min maxchangewidth changewidth'
balwidth = min maxbalwidth balwidth' balwidth = min maxbalwidth balwidth'
@ -121,8 +121,8 @@ drawRegisterScreen2 AppState{aopts=_opts, aScreen=RegisterScreen2{rs2State=l}} =
-- allocating proportionally. -- allocating proportionally.
-- descwidth' = maximum' $ map (length . second5) displayitems -- descwidth' = maximum' $ map (length . second5) displayitems
-- acctswidth' = maximum' $ map (length . third5) displayitems -- acctswidth' = maximum' $ map (length . third5) displayitems
-- descwidthproportion = (descwidth' + acctswidth') `div` descwidth' -- descwidthproportion = (descwidth' + acctswidth') / descwidth'
-- maxdescwidth = min (maxdescacctswidth - 7) (maxdescacctswidth `div` descwidthproportion) -- maxdescwidth = min (maxdescacctswidth - 7) (maxdescacctswidth / descwidthproportion)
-- maxacctswidth = maxdescacctswidth - maxdescwidth -- maxacctswidth = maxdescacctswidth - maxdescwidth
-- descwidth = min maxdescwidth descwidth' -- descwidth = min maxdescwidth descwidth'
-- acctswidth = min maxacctswidth acctswidth' -- acctswidth = min maxacctswidth acctswidth'