jtdaugherty/brick
1
1
Fork 0
mirror of https://github.com/jtdaugherty/brick.git synced 2025-01-08 15:08:46 +03:00
Code Issues Projects Releases Wiki Activity

Core: when rendering viewports, process scroll requests first, then visibility requests

Browse Source
This commit is contained in:
Jonathan Daugherty 2015-08-21 20:29:06 -07:00
parent 5d9036f934
commit 5314a68477
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Brick/Widgets/Core.hs
View File

@ -562,17 +562,6 @@ viewport vpname typ p =
initialResult <- render released initialResult <- render released
-- If the sub-rendering requested visibility, update the scroll
-- state accordingly
when (not $ null $ initialResult^.visibilityRequestsL) $ do
Just vp <- lift $ gets $ (^.viewportMapL.to (M.lookup vpname))
let rq = head $ initialResult^.visibilityRequestsL
updatedVp = case typ of
Both -> scrollToView Horizontal rq $ scrollToView Vertical rq vp
Horizontal -> scrollToView typ rq vp
Vertical -> scrollToView typ rq vp
lift $ modify (& viewportMapL %~ (M.insert vpname updatedVp))
-- If the rendering state includes any scrolling requests for this -- If the rendering state includes any scrolling requests for this
-- viewport, apply those -- viewport, apply those
reqs <- lift $ gets $ (^.scrollRequestsL) reqs <- lift $ gets $ (^.scrollRequestsL)
@ -591,6 +580,17 @@ viewport vpname typ p =
lift $ modify (& viewportMapL %~ (M.insert vpname updatedVp)) lift $ modify (& viewportMapL %~ (M.insert vpname updatedVp))
return () return ()
-- If the sub-rendering requested visibility, update the scroll
-- state accordingly
when (not $ null $ initialResult^.visibilityRequestsL) $ do
Just vp <- lift $ gets $ (^.viewportMapL.to (M.lookup vpname))
let rq = head $ initialResult^.visibilityRequestsL
updatedVp = case typ of
Both -> scrollToView Horizontal rq $ scrollToView Vertical rq vp
Horizontal -> scrollToView typ rq vp
Vertical -> scrollToView typ rq vp
lift $ modify (& viewportMapL %~ (M.insert vpname updatedVp))
-- Get the viewport state now that it has been updated. -- Get the viewport state now that it has been updated.
Just vp <- lift $ gets (M.lookup vpname . (^.viewportMapL)) Just vp <- lift $ gets (M.lookup vpname . (^.viewportMapL))