jtdaugherty/brick
1
1
Fork 0
mirror of https://github.com/jtdaugherty/brick.git synced 2024-11-26 17:13:57 +03:00
Code Issues Projects Releases Wiki Activity

Update mouse demo with Clicked event test

Browse Source
This commit is contained in:
Jonathan Daugherty 2016-10-25 20:44:22 -07:00
parent 6b427c6ce6
commit 940435ddcc
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/CustomEventDemo.hs
View File

@ -51,6 +51,7 @@ appEvent st e =
VtyEvent _ -> continue $ st & stLastBrickEvent .~ (Just e) VtyEvent _ -> continue $ st & stLastBrickEvent .~ (Just e)
AppEvent Counter -> continue $ st & stCounter %~ (+1) AppEvent Counter -> continue $ st & stCounter %~ (+1)
& stLastBrickEvent .~ (Just e) & stLastBrickEvent .~ (Just e)
_ -> continue st
initialState :: St initialState :: St
initialState = initialState =

11
programs/MouseDemo.hs
View File

@ -28,6 +28,7 @@ data St =
St { _draggableLayerLocation :: T.Location St { _draggableLayerLocation :: T.Location
, _lastDragLoc :: DragState , _lastDragLoc :: DragState
, _clicked :: [T.Extent Name] , _clicked :: [T.Extent Name]
, _lastReportedClick :: Maybe Name
} }
makeLenses ''St makeLenses ''St
@ -42,7 +43,10 @@ infoLayer :: St -> Widget Name
infoLayer st = T.Widget T.Fixed T.Fixed $ do infoLayer st = T.Widget T.Fixed T.Fixed $ do
c <- T.getContext c <- T.getContext
let h = c^.T.availHeightL let h = c^.T.availHeightL
T.render $ translateBy (T.Location (0, h-2)) $ reportExtent Info $ dragInfo st T.render $ translateBy (T.Location (0, h-3)) $ clickable Info $
withDefAttr "info" $
dragInfo st <=>
C.hCenter (str ("Last reported click: " <> show (st^.lastReportedClick)))
dragInfo :: St -> Widget Name dragInfo :: St -> Widget Name
dragInfo st = dragInfo st =
@ -53,7 +57,7 @@ dragInfo st =
if b if b
then "(dragging layer)" then "(dragging layer)"
else "(dragging outside of layer)" else "(dragging outside of layer)"
in withDefAttr "info" $ C.hCenter (str $ show $ st^.clicked) <=> C.hCenter infoStr in C.hCenter (str $ show $ st^.clicked) <=> C.hCenter infoStr
draggableLayer :: St -> Widget Name draggableLayer :: St -> Widget Name
draggableLayer st = draggableLayer st =
@ -69,6 +73,7 @@ draggableLayer st =
"on or within its border.") <+> fill ' ' "on or within its border.") <+> fill ' '
appEvent :: St -> T.BrickEvent Name e -> T.EventM Name (T.Next St) appEvent :: St -> T.BrickEvent Name e -> T.EventM Name (T.Next St)
appEvent st (T.Clicked n _ _) = M.continue $ st & lastReportedClick .~ Just n
appEvent st (T.VtyEvent (V.EvKey V.KEsc [])) = M.halt st appEvent st (T.VtyEvent (V.EvKey V.KEsc [])) = M.halt st
appEvent st (T.VtyEvent ev) = do appEvent st (T.VtyEvent ev) = do
Just e <- M.lookupExtent Layer Just e <- M.lookupExtent Layer
@ -117,4 +122,4 @@ app =
} }
main :: IO () main :: IO ()
main = void $ M.defaultMain app $ St (T.Location (0, 0)) NotDragging [] main = void $ M.defaultMain app $ St (T.Location (0, 0)) NotDragging [] Nothing