From 455c71c9ab6a5076b5c88d0a4b46428a0827e59f Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 24 Aug 2015 16:21:28 -0700
Subject: [PATCH] ui: reg: fix width undercalculation

---
 hledger-ui/Hledger/UI/RegisterScreen2.hs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/hledger-ui/Hledger/UI/RegisterScreen2.hs b/hledger-ui/Hledger/UI/RegisterScreen2.hs
index c108d8ba9..2cf211c73 100644
--- a/hledger-ui/Hledger/UI/RegisterScreen2.hs
+++ b/hledger-ui/Hledger/UI/RegisterScreen2.hs
@@ -107,18 +107,22 @@ drawRegisterScreen2 AppState{aopts=_opts, aScreen=RegisterScreen2{rs2State=l}} =
         -- they need, while reserving a minimum of space for other
         -- columns and whitespace.  If they don't get all they need,
         -- allocate it to them proportionally to their maximum widths.
-        whitespacewidth = 23
-        maxamtswidth = max 0 (totalwidth - whitespacewidth)
+        whitespacewidth = 9 -- inter-column whitespace, fixed width
+        minnonamtcolswidth = datewidth + 2 + 2 -- date column plus at least 2 for desc and accts
+        maxamtswidth = max 0 (totalwidth - minnonamtcolswidth - whitespacewidth)
         maxchangewidthseen = maximum' $ map (length . fourth5) displayitems
         maxbalwidthseen = maximum' $ map (length . fifth5) displayitems
-        changewidthproportion = fromIntegral (maxchangewidthseen + maxbalwidthseen) / fromIntegral maxchangewidthseen
-        maxchangewidth = round $ fromIntegral maxamtswidth / changewidthproportion
+        changewidthproportion = fromIntegral maxchangewidthseen / fromIntegral (maxchangewidthseen + maxbalwidthseen)
+        maxchangewidth = round $ changewidthproportion * fromIntegral maxamtswidth
         maxbalwidth = maxamtswidth - maxchangewidth
         changewidth = min maxchangewidth maxchangewidthseen 
         balwidth = min maxbalwidth maxbalwidthseen
 
         -- assign the remaining space to the description and accounts columns
-        maxdescacctswidth = max 0 (totalwidth - datewidth - changewidth - balwidth - (whitespacewidth - 2))
+        -- maxdescacctswidth = totalwidth - (whitespacewidth - 4) - changewidth - balwidth
+        maxdescacctswidth =
+          -- trace (show (totalwidth, datewidth, changewidth, balwidth, whitespacewidth)) $
+          max 0 (totalwidth - datewidth - changewidth - balwidth - whitespacewidth)
         -- allocating proportionally.
         -- descwidth' = maximum' $ map (length . second5) displayitems
         -- acctswidth' = maximum' $ map (length . third5) displayitems