diff --git a/hledger-lib/Hledger/Reports/BudgetReport.hs b/hledger-lib/Hledger/Reports/BudgetReport.hs index 782740410..94ca4f52a 100644 --- a/hledger-lib/Hledger/Reports/BudgetReport.hs +++ b/hledger-lib/Hledger/Reports/BudgetReport.hs @@ -239,7 +239,7 @@ budgetReportAsText ropts@ReportOpts{..} budgetr = where actual' = fromMaybe 0 actual budgetAndPerc b = (showamt b, showper <$> percentage actual' b) - showamt = showMixedOneLine showAmountWithoutPrice Nothing (Just 22) color_ + showamt = showMixedOneLine showAmountWithoutPrice Nothing (Just 32) color_ showper p = let str = show (roundTo 0 p) in (str, length str) cellWidth ((_,wa), Nothing) = (wa, 0, 0) cellWidth ((_,wa), Just ((_,wb), Nothing)) = (wa, wb, 0) diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs index 309bd8244..d37292569 100644 --- a/hledger-ui/Hledger/UI/RegisterScreen.hs +++ b/hledger-ui/Hledger/UI/RegisterScreen.hs @@ -93,8 +93,8 @@ rsInit d reset ui@UIState{aopts=_uopts@UIOpts{cliopts_=CliOpts{reportspec_=rspec [s] -> s ss -> intercalate ", " ss -- _ -> "" -- should do this if accounts field width < 30 - ,rsItemChangeAmount = showMixed showAmountWithoutPrice Nothing (Just 22) False change - ,rsItemBalanceAmount = showMixed showAmountWithoutPrice Nothing (Just 22) False bal + ,rsItemChangeAmount = showMixed showAmountWithoutPrice Nothing (Just 32) False change + ,rsItemBalanceAmount = showMixed showAmountWithoutPrice Nothing (Just 32) False bal ,rsItemTransaction = t } -- blank items are added to allow more control of scroll position; we won't allow movement over these diff --git a/hledger/Hledger/Cli/Commands/Aregister.hs b/hledger/Hledger/Cli/Commands/Aregister.hs index 58b6bc85c..b7a316ccc 100644 --- a/hledger/Hledger/Cli/Commands/Aregister.hs +++ b/hledger/Hledger/Cli/Commands/Aregister.hs @@ -150,7 +150,7 @@ accountTransactionsReportAsText amtwidth = maximumStrict $ 12 : map (snd . showamt . itemamt) items balwidth = maximumStrict $ 12 : map (snd . showamt . itembal) items showamt = showMixedOneLine showAmountWithoutPrice (Just 12) mmax False -- color_ - where mmax = if no_elide_ then Nothing else Just 22 + where mmax = if no_elide_ then Nothing else Just 32 itemamt (_,_,_,_,a,_) = a itembal (_,_,_,_,_,a) = a -- show a title indicating which account was picked, which can be confusing otherwise diff --git a/hledger/Hledger/Cli/Commands/Balance.hs b/hledger/Hledger/Cli/Commands/Balance.hs index c1452c923..9a3ad7869 100644 --- a/hledger/Hledger/Cli/Commands/Balance.hs +++ b/hledger/Hledger/Cli/Commands/Balance.hs @@ -612,7 +612,7 @@ balanceReportTableAsText ReportOpts{..} = where showamt a = CellSpec str AlignRight w where (str, w) = showMixedOneLine showAmountWithoutPrice Nothing mmax color_ a - mmax = if no_elide_ then Nothing else Just 22 + mmax = if no_elide_ then Nothing else Just 32 tests_Balance = tests "Balance" [ diff --git a/tests/balance/multicommodity.test b/tests/balance/multicommodity.test index a2576da6a..486090608 100644 --- a/tests/balance/multicommodity.test +++ b/tests/balance/multicommodity.test @@ -5,22 +5,24 @@ (a) 1.00B (a) 1.00C (a) 1.00D + (a) 1.00E + (a) 1.00F $ hledger -f- bal -Y Balance changes in 2020: - || 2020 -===++======================== - a || 1.00A, 1.00B, 2 more.. ----++------------------------ - || 1.00A, 1.00B, 2 more.. + || 2020 +===++=============================== + a || 1.00A, 1.00B, 1.00C, 3 more.. +---++------------------------------- + || 1.00A, 1.00B, 1.00C, 3 more.. # 2. Unless --no-elide is used. $ hledger -f- bal -Y --no-elide Balance changes in 2020: - || 2020 -===++============================ - a || 1.00A, 1.00B, 1.00C, 1.00D ----++---------------------------- - || 1.00A, 1.00B, 1.00C, 1.00D + || 2020 +===++========================================== + a || 1.00A, 1.00B, 1.00C, 1.00D, 1.00E, 1.00F +---++------------------------------------------ + || 1.00A, 1.00B, 1.00C, 1.00D, 1.00E, 1.00F