jtdaugherty/brick
1
1
Fork 0
mirror of https://github.com/jtdaugherty/brick.git synced 2025-01-06 05:14:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #142 from aisamanra/master

Browse Source 
Update AttrMap for the URL annotations in VTY
This commit is contained in:
Jonathan Daugherty 2017-10-06 12:44:46 -07:00 committed by GitHub
commit d0c09ba51e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Brick/AttrMap.hs
View File

@ -150,10 +150,11 @@ setDefault _ (ForceAttr a) = ForceAttr a
setDefault newDefault (AttrMap _ m) = AttrMap newDefault m
combineAttrs :: Attr -> Attr -> Attr
combineAttrs (Attr s1 f1 b1) (Attr s2 f2 b2) =
combineAttrs (Attr s1 f1 b1 u1) (Attr s2 f2 b2 u2) =
Attr (s1 `combineMDs` s2)
(f1 `combineMDs` f2)
(b1 `combineMDs` b2)
(u1 `combineMDs` u2)
combineMDs :: MaybeDefault a -> MaybeDefault a -> MaybeDefault a
combineMDs _ (SetTo v) = SetTo v