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

fix:ui: Fixed #2284 -- valuation and cost flags now reset each other on toggle.

Browse Source
This commit is contained in:
Gal Lakovnik Gorenec 2024-11-17 03:37:28 +01:00 committed by Simon Michael
parent 21d8044bcf
commit 255dc015eb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hledger-ui/Hledger/UI/UIState.hs
View File

@ -149,15 +149,16 @@ toggleEmpty = over empty__ not
-- | Toggle between showing the primary amounts or costs. -- | Toggle between showing the primary amounts or costs.
toggleConversionOp :: UIState -> UIState toggleConversionOp :: UIState -> UIState
toggleConversionOp = over conversionop toggleCostMode toggleConversionOp ui = (over value valOff) (over conversionop toggleCostMode ui)
where where
toggleCostMode Nothing = Just ToCost toggleCostMode Nothing = Just ToCost
toggleCostMode (Just NoConversionOp) = Just ToCost toggleCostMode (Just NoConversionOp) = Just ToCost
toggleCostMode (Just ToCost) = Just NoConversionOp toggleCostMode (Just ToCost) = Just NoConversionOp
valOff _ = Nothing
-- | Toggle between showing primary amounts or values (using valuation specified at startup, or a default). -- | Toggle between showing primary amounts or values (using valuation specified at startup, or a default).
toggleValue :: UIState -> UIState toggleValue :: UIState -> UIState
toggleValue ui = over value (valuationToggleValue mstartupvaluation0) ui toggleValue ui = (over conversionop costOff) (over value (valuationToggleValue mstartupvaluation0) ui)
where where
mstartupvaluation0 = value_ $ _rsReportOpts $ reportspec_ $ uoCliOpts $ astartupopts ui mstartupvaluation0 = value_ $ _rsReportOpts $ reportspec_ $ uoCliOpts $ astartupopts ui
mdefvaluation = Just (AtEnd Nothing) mdefvaluation = Just (AtEnd Nothing)
@ -166,6 +167,7 @@ toggleValue ui = over value (valuationToggleValue mstartupvaluation0) ui
valuationToggleValue Nothing (Just _) = Nothing valuationToggleValue Nothing (Just _) = Nothing
valuationToggleValue mstartupvaluation Nothing = mstartupvaluation valuationToggleValue mstartupvaluation Nothing = mstartupvaluation
valuationToggleValue _ (Just _) = Nothing valuationToggleValue _ (Just _) = Nothing
costOff _ = Just NoConversionOp
-- | Set hierarchic account tree mode. -- | Set hierarchic account tree mode.
setTree :: UIState -> UIState setTree :: UIState -> UIState