jtdaugherty/brick
1
1
Fork 0
mirror of https://github.com/jtdaugherty/brick.git synced 2024-11-30 14:34:56 +03:00
Code Issues Projects Releases Wiki Activity

Themes: permit all sections to be optional

Browse Source
This commit is contained in:
Jonathan Daugherty 2017-10-29 20:40:26 -07:00
parent 1aa08ef269
commit 7daf38e1b1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Brick/Themes.hs
View File

@ -21,7 +21,7 @@ where
import GHC.Generics (Generic)
import Graphics.Vty hiding ((<|>))
import Control.Monad (forM)
import Control.Monad (forM, join)
import Control.Applicative ((<|>))
import qualified Data.Text as T
import qualified Data.Text.IO as T
@ -173,15 +173,15 @@ themeParser t = do
<*> fieldMbOf (basename <> ".style") parseStyle
return $ if isNullCustomization c then Nothing else Just c
defCustom <- section "default" $ do
defCustom <- sectionMb "default" $ do
parseCustomAttr "default"
customMap <- section "custom" $ do
customMap <- sectionMb "custom" $ do
catMaybes <$> (forM (M.keys $ themeDefaultMapping t) $ \an ->
(fmap (an,)) <$> parseCustomAttr (T.pack $ intercalate "." $ attrNameComponents an)
)
return (defCustom, M.fromList customMap)
return (join defCustom, M.fromList $ fromMaybe [] customMap)
loadCustomizations :: FilePath -> Theme -> IO (Either String Theme)
loadCustomizations path t = do