jtdaugherty/brick
1
1
Fork 0
mirror of https://github.com/jtdaugherty/brick.git synced 2024-12-02 11:05:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54 from ahgilbert/master

Browse Source 
ListDemo: rename Data.Vector from V to Vec to avoid qualified import confusion
This commit is contained in:
Jonathan Daugherty 2016-05-15 09:44:10 -07:00
commit ff8bd5651c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/ListDemo.hs
View File

@ -13,7 +13,7 @@ import qualified Brick.Widgets.Border as B
import qualified Brick.Widgets.List as L import qualified Brick.Widgets.List as L
import qualified Brick.Widgets.Center as C import qualified Brick.Widgets.Center as C
import qualified Brick.AttrMap as A import qualified Brick.AttrMap as A
import qualified Data.Vector as V import qualified Data.Vector as Vec
import Brick.Types import Brick.Types
( Widget ( Widget
) )
@ -34,7 +34,7 @@ drawUI l = [ui]
cur = case l^.(L.listSelectedL) of cur = case l^.(L.listSelectedL) of
Nothing -> str "-" Nothing -> str "-"
Just i -> str (show (i + 1)) Just i -> str (show (i + 1))
total = str $ show $ V.length $ l^.(L.listElementsL) total = str $ show $ Vec.length $ l^.(L.listElementsL)
box = B.borderWithLabel label $ box = B.borderWithLabel label $
hLimit 25 $ hLimit 25 $
vLimit 15 $ vLimit 15 $
@ -50,7 +50,7 @@ appEvent l e =
case e of case e of
V.EvKey (V.KChar '+') [] -> V.EvKey (V.KChar '+') [] ->
let el = nextElement (L.listElements l) let el = nextElement (L.listElements l)
pos = V.length $ l^.(L.listElementsL) pos = Vec.length $ l^.(L.listElementsL)
in M.continue $ L.listInsert pos el l in M.continue $ L.listInsert pos el l
V.EvKey (V.KChar '-') [] -> V.EvKey (V.KChar '-') [] ->
@ -62,8 +62,8 @@ appEvent l e =
ev -> M.continue =<< T.handleEvent ev l ev -> M.continue =<< T.handleEvent ev l
where where
nextElement :: V.Vector Char -> Char nextElement :: Vec.Vector Char -> Char
nextElement v = fromMaybe '?' $ V.find (flip V.notElem v) (V.fromList ['a' .. 'z']) nextElement v = fromMaybe '?' $ Vec.find (flip Vec.notElem v) (Vec.fromList ['a' .. 'z'])
listDrawElement :: (Show a) => Bool -> a -> Widget listDrawElement :: (Show a) => Bool -> a -> Widget
listDrawElement sel a = listDrawElement sel a =
@ -73,7 +73,7 @@ listDrawElement sel a =
in C.hCenter $ str "Item " <+> (selStr $ show a) in C.hCenter $ str "Item " <+> (selStr $ show a)
initialState :: L.List Char initialState :: L.List Char
initialState = L.list (T.Name "list") (V.fromList ['a','b','c']) 1 initialState = L.list (T.Name "list") (Vec.fromList ['a','b','c']) 1
customAttr :: A.AttrName customAttr :: A.AttrName
customAttr = L.listSelectedAttr <> "custom" customAttr = L.listSelectedAttr <> "custom"