mirror of
https://github.com/jtdaugherty/brick.git
synced 2024-08-17 11:50:24 +03:00
Merge branch 'master' into refactor/vty-crossplatform
This commit is contained in:
commit
d442145c78
29
CHANGELOG.md
29
CHANGELOG.md
@ -2,6 +2,35 @@
|
||||
Brick changelog
|
||||
---------------
|
||||
|
||||
1.10
|
||||
----
|
||||
|
||||
API changes:
|
||||
* The `ScrollbarRenderer` type got split up into vertical and horizontal
|
||||
versions, `VScrollbarRenderer` and `HScrollbarRenderer`, respectively.
|
||||
Their fields are nearly identical to the original `ScrollbarRenderer`
|
||||
fields except that many fields now have a `V` or `H` in them as
|
||||
appropriate. As part of this change, the various `Brick.Widgets.Core`
|
||||
functions that deal with the renderers got their types updated, and
|
||||
the types of the default scroll bar renderers changed, too.
|
||||
* The scroll bar renderers now have a field to control how much space
|
||||
is allocated to a scroll bar. Previously, all scroll bars were
|
||||
assumed to be exactly one row in height or one column in width. This
|
||||
change is motivated by a desire to be able to control how scroll
|
||||
bars are rendered adjacent to viewport contents. It isn't always
|
||||
desirable to render them right up against the contents; sometimes,
|
||||
spacing would be nice between the bar and contents, for example.
|
||||
As part of this change, `VScrollbarRenderer` got a field called
|
||||
`scrollbarWidthAllocation` and `HScrollbarRenderer` got a field called
|
||||
`scrollbarHeightAllocation`. The fields specify the height (for
|
||||
horizontal scroll bars) or width (for vertical ones) of the region
|
||||
in which the bar is rendered, allowing scroll bar element widgets
|
||||
to take up more than one row in height (for horizontal scroll bars)
|
||||
or more than one column in width (for vertical ones) as desired. If
|
||||
the widgets take up less space, padding is added between the scroll
|
||||
bar and the viewport contents to pad the scroll bar to take up the
|
||||
specified allocation.
|
||||
|
||||
1.9
|
||||
---
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
name: brick
|
||||
version: 1.9
|
||||
version: 1.10
|
||||
synopsis: A declarative terminal user interface library
|
||||
description:
|
||||
Write terminal user interfaces (TUIs) painlessly with 'brick'! You
|
||||
|
@ -42,21 +42,33 @@ import Brick.Widgets.Core
|
||||
, withVScrollBars
|
||||
, withHScrollBars
|
||||
, withHScrollBarRenderer
|
||||
, withVScrollBarRenderer
|
||||
, withVScrollBarHandles
|
||||
, withHScrollBarHandles
|
||||
, withClickableHScrollBars
|
||||
, withClickableVScrollBars
|
||||
, ScrollbarRenderer(..)
|
||||
, VScrollbarRenderer(..)
|
||||
, HScrollbarRenderer(..)
|
||||
, scrollbarAttr
|
||||
, scrollbarHandleAttr
|
||||
)
|
||||
|
||||
customScrollbars :: ScrollbarRenderer n
|
||||
customScrollbars =
|
||||
ScrollbarRenderer { renderScrollbar = fill '^'
|
||||
, renderScrollbarTrough = fill ' '
|
||||
, renderScrollbarHandleBefore = str "<<"
|
||||
, renderScrollbarHandleAfter = str ">>"
|
||||
customHScrollbars :: HScrollbarRenderer n
|
||||
customHScrollbars =
|
||||
HScrollbarRenderer { renderHScrollbar = vLimit 1 $ fill '^'
|
||||
, renderHScrollbarTrough = vLimit 1 $ fill ' '
|
||||
, renderHScrollbarHandleBefore = str "<<"
|
||||
, renderHScrollbarHandleAfter = str ">>"
|
||||
, scrollbarHeightAllocation = 2
|
||||
}
|
||||
|
||||
customVScrollbars :: VScrollbarRenderer n
|
||||
customVScrollbars =
|
||||
VScrollbarRenderer { renderVScrollbar = C.hCenter $ hLimit 1 $ fill '*'
|
||||
, renderVScrollbarTrough = fill ' '
|
||||
, renderVScrollbarHandleBefore = C.hCenter $ str "-^-"
|
||||
, renderVScrollbarHandleAfter = C.hCenter $ str "-v-"
|
||||
, scrollbarWidthAllocation = 5
|
||||
}
|
||||
|
||||
data Name = VP1 | VP2 | SBClick T.ClickableScrollbarElement Name
|
||||
@ -69,7 +81,7 @@ makeLenses ''St
|
||||
drawUi :: St -> [Widget Name]
|
||||
drawUi st = [ui]
|
||||
where
|
||||
ui = C.center $ hLimit 70 $ vLimit 21 $
|
||||
ui = C.center $ hLimit 80 $ vLimit 21 $
|
||||
(vBox [ pair
|
||||
, C.hCenter (str "Last clicked scroll bar element:")
|
||||
, str $ show $ _lastClickedElement st
|
||||
@ -78,7 +90,7 @@ drawUi st = [ui]
|
||||
B.border $
|
||||
withClickableHScrollBars SBClick $
|
||||
withHScrollBars OnBottom $
|
||||
withHScrollBarRenderer customScrollbars $
|
||||
withHScrollBarRenderer customHScrollbars $
|
||||
withHScrollBarHandles $
|
||||
viewport VP1 Horizontal $
|
||||
str $ "Press left and right arrow keys to scroll this viewport.\n" <>
|
||||
@ -87,9 +99,18 @@ drawUi st = [ui]
|
||||
, B.border $
|
||||
withClickableVScrollBars SBClick $
|
||||
withVScrollBars OnLeft $
|
||||
withVScrollBarRenderer customVScrollbars $
|
||||
withVScrollBarHandles $
|
||||
viewport VP2 Both $
|
||||
vBox $ str "Press ctrl-arrow keys to scroll this viewport horizontally and vertically."
|
||||
vBox $
|
||||
(str $ unlines $
|
||||
[ "Press up and down arrow keys to"
|
||||
, "scroll this viewport vertically."
|
||||
, "This viewport uses a custom"
|
||||
, "scroll bar renderer with"
|
||||
, "a larger space allocation and"
|
||||
, "even more fancy rendering."
|
||||
])
|
||||
: (str <$> [ "Line " <> show i | i <- [2..55::Int] ])
|
||||
]
|
||||
|
||||
@ -106,6 +127,7 @@ appEvent (T.VtyEvent (V.EvKey V.KDown [])) = M.vScrollBy vp2Scroll 1
|
||||
appEvent (T.VtyEvent (V.EvKey V.KUp [])) = M.vScrollBy vp2Scroll (-1)
|
||||
appEvent (T.VtyEvent (V.EvKey V.KEsc [])) = M.halt
|
||||
appEvent (T.MouseDown (SBClick el n) _ _ _) = do
|
||||
lastClickedElement .= Just (el, n)
|
||||
case n of
|
||||
VP1 -> do
|
||||
let vp = M.viewportScroll VP1
|
||||
@ -125,8 +147,6 @@ appEvent (T.MouseDown (SBClick el n) _ _ _) = do
|
||||
T.SBBar -> return ()
|
||||
_ ->
|
||||
return ()
|
||||
|
||||
lastClickedElement .= Just (el, n)
|
||||
appEvent _ = return ()
|
||||
|
||||
theme :: AttrMap
|
||||
|
@ -22,7 +22,8 @@ module Brick.Types
|
||||
, vpContentSize
|
||||
, VScrollBarOrientation(..)
|
||||
, HScrollBarOrientation(..)
|
||||
, ScrollbarRenderer(..)
|
||||
, VScrollbarRenderer(..)
|
||||
, HScrollbarRenderer(..)
|
||||
, ClickableScrollbarElement(..)
|
||||
|
||||
-- * Event-handling types and functions
|
||||
|
@ -22,7 +22,8 @@ module Brick.Types.Internal
|
||||
, cursorLocationVisibleL
|
||||
, VScrollBarOrientation(..)
|
||||
, HScrollBarOrientation(..)
|
||||
, ScrollbarRenderer(..)
|
||||
, VScrollbarRenderer(..)
|
||||
, HScrollbarRenderer(..)
|
||||
, ClickableScrollbarElement(..)
|
||||
, Context(..)
|
||||
, ctxAttrMapL
|
||||
@ -165,32 +166,67 @@ data VScrollBarOrientation = OnLeft | OnRight
|
||||
data HScrollBarOrientation = OnBottom | OnTop
|
||||
deriving (Show, Eq)
|
||||
|
||||
-- | A scroll bar renderer.
|
||||
data ScrollbarRenderer n =
|
||||
ScrollbarRenderer { renderScrollbar :: Widget n
|
||||
-- | A vertical scroll bar renderer.
|
||||
data VScrollbarRenderer n =
|
||||
VScrollbarRenderer { renderVScrollbar :: Widget n
|
||||
-- ^ How to render the body of the scroll bar.
|
||||
-- This should provide a widget that expands in
|
||||
-- whatever direction(s) this renderer will be
|
||||
-- used for. So, for example, if this was used to
|
||||
-- render vertical scroll bars, this widget would
|
||||
-- used for. So, for example, this widget would
|
||||
-- need to be one that expands vertically such as
|
||||
-- @fill@. The same goes for the trough widget.
|
||||
, renderScrollbarTrough :: Widget n
|
||||
, renderVScrollbarTrough :: Widget n
|
||||
-- ^ How to render the "trough" of the scroll bar
|
||||
-- (the area to either side of the scroll bar
|
||||
-- body). This should expand as described in the
|
||||
-- documentation for the scroll bar field.
|
||||
, renderScrollbarHandleBefore :: Widget n
|
||||
-- ^ How to render the handle that appears at the
|
||||
-- top or left of the scrollbar. The result should
|
||||
-- be at most one row high for horizontal handles
|
||||
-- and one column wide for vertical handles.
|
||||
, renderScrollbarHandleAfter :: Widget n
|
||||
, renderVScrollbarHandleBefore :: Widget n
|
||||
-- ^ How to render the handle that appears at
|
||||
-- the bottom or right of the scrollbar. The
|
||||
-- result should be at most one row high for
|
||||
-- horizontal handles and one column wide for
|
||||
-- vertical handles.
|
||||
-- the top or left of the scrollbar. The result
|
||||
-- will be allowed to be at most one row high.
|
||||
, renderVScrollbarHandleAfter :: Widget n
|
||||
-- ^ How to render the handle that appears at the
|
||||
-- bottom or right of the scrollbar. The result
|
||||
-- will be allowed to be at most one row high.
|
||||
, scrollbarWidthAllocation :: Int
|
||||
-- ^ The number of columns that will be allocated
|
||||
-- to the scroll bar. This determines how much
|
||||
-- space the widgets of the scroll bar elements
|
||||
-- can take up. If they use less than this
|
||||
-- amount, padding will be applied between the
|
||||
-- scroll bar and the viewport contents.
|
||||
}
|
||||
|
||||
-- | A horizontal scroll bar renderer.
|
||||
data HScrollbarRenderer n =
|
||||
HScrollbarRenderer { renderHScrollbar :: Widget n
|
||||
-- ^ How to render the body of the scroll bar.
|
||||
-- This should provide a widget that expands
|
||||
-- in whatever direction(s) this renderer will
|
||||
-- be used for. So, for example, this widget
|
||||
-- would need to be one that expands horizontally
|
||||
-- such as @fill@. The same goes for the trough
|
||||
-- widget.
|
||||
, renderHScrollbarTrough :: Widget n
|
||||
-- ^ How to render the "trough" of the scroll bar
|
||||
-- (the area to either side of the scroll bar
|
||||
-- body). This should expand as described in the
|
||||
-- documentation for the scroll bar field.
|
||||
, renderHScrollbarHandleBefore :: Widget n
|
||||
-- ^ How to render the handle that appears at the
|
||||
-- top or left of the scrollbar. The result will
|
||||
-- be allowed to be at most one column wide.
|
||||
, renderHScrollbarHandleAfter :: Widget n
|
||||
-- ^ How to render the handle that appears at the
|
||||
-- bottom or right of the scrollbar. The result
|
||||
-- will be allowed to be at most one column wide.
|
||||
, scrollbarHeightAllocation :: Int
|
||||
-- ^ The number of rows that will be allocated to
|
||||
-- the scroll bar. This determines how much space
|
||||
-- the widgets of the scroll bar elements can
|
||||
-- take up. If they use less than this amount,
|
||||
-- padding will be applied between the scroll bar
|
||||
-- and the viewport contents.
|
||||
}
|
||||
|
||||
data VisibilityRequest =
|
||||
@ -405,9 +441,9 @@ data Context n =
|
||||
, ctxAttrMap :: AttrMap
|
||||
, ctxDynBorders :: Bool
|
||||
, ctxVScrollBarOrientation :: Maybe VScrollBarOrientation
|
||||
, ctxVScrollBarRenderer :: Maybe (ScrollbarRenderer n)
|
||||
, ctxVScrollBarRenderer :: Maybe (VScrollbarRenderer n)
|
||||
, ctxHScrollBarOrientation :: Maybe HScrollBarOrientation
|
||||
, ctxHScrollBarRenderer :: Maybe (ScrollbarRenderer n)
|
||||
, ctxHScrollBarRenderer :: Maybe (HScrollbarRenderer n)
|
||||
, ctxVScrollBarShowHandles :: Bool
|
||||
, ctxHScrollBarShowHandles :: Bool
|
||||
, ctxVScrollBarClickableConstr :: Maybe (ClickableScrollbarElement -> n -> n)
|
||||
|
@ -101,7 +101,8 @@ module Brick.Widgets.Core
|
||||
, withHScrollBarHandles
|
||||
, withVScrollBarRenderer
|
||||
, withHScrollBarRenderer
|
||||
, ScrollbarRenderer(..)
|
||||
, VScrollbarRenderer(..)
|
||||
, HScrollbarRenderer(..)
|
||||
, verticalScrollbarRenderer
|
||||
, horizontalScrollbarRenderer
|
||||
, scrollbarAttr
|
||||
@ -1285,19 +1286,20 @@ withVScrollBarHandles w =
|
||||
-- | Render vertical viewport scroll bars in the specified widget with
|
||||
-- the specified renderer. This is only needed if you want to override
|
||||
-- the use of the default renderer, 'verticalScrollbarRenderer'.
|
||||
withVScrollBarRenderer :: ScrollbarRenderer n -> Widget n -> Widget n
|
||||
withVScrollBarRenderer :: VScrollbarRenderer n -> Widget n -> Widget n
|
||||
withVScrollBarRenderer r w =
|
||||
Widget (hSize w) (vSize w) $
|
||||
withReaderT (ctxVScrollBarRendererL .~ Just r) (render w)
|
||||
|
||||
-- | The default renderer for vertical viewport scroll bars. Override
|
||||
-- with 'withVScrollBarRenderer'.
|
||||
verticalScrollbarRenderer :: ScrollbarRenderer n
|
||||
verticalScrollbarRenderer :: VScrollbarRenderer n
|
||||
verticalScrollbarRenderer =
|
||||
ScrollbarRenderer { renderScrollbar = fill '█'
|
||||
, renderScrollbarTrough = fill ' '
|
||||
, renderScrollbarHandleBefore = str "^"
|
||||
, renderScrollbarHandleAfter = str "v"
|
||||
VScrollbarRenderer { renderVScrollbar = fill '█'
|
||||
, renderVScrollbarTrough = fill ' '
|
||||
, renderVScrollbarHandleBefore = str "^"
|
||||
, renderVScrollbarHandleAfter = str "v"
|
||||
, scrollbarWidthAllocation = 1
|
||||
}
|
||||
|
||||
-- | Enable horizontal scroll bars on all viewports in the specified
|
||||
@ -1343,19 +1345,20 @@ withHScrollBarHandles w =
|
||||
-- | Render horizontal viewport scroll bars in the specified widget with
|
||||
-- the specified renderer. This is only needed if you want to override
|
||||
-- the use of the default renderer, 'horizontalScrollbarRenderer'.
|
||||
withHScrollBarRenderer :: ScrollbarRenderer n -> Widget n -> Widget n
|
||||
withHScrollBarRenderer :: HScrollbarRenderer n -> Widget n -> Widget n
|
||||
withHScrollBarRenderer r w =
|
||||
Widget (hSize w) (vSize w) $
|
||||
withReaderT (ctxHScrollBarRendererL .~ Just r) (render w)
|
||||
|
||||
-- | The default renderer for horizontal viewport scroll bars. Override
|
||||
-- with 'withHScrollBarRenderer'.
|
||||
horizontalScrollbarRenderer :: ScrollbarRenderer n
|
||||
horizontalScrollbarRenderer :: HScrollbarRenderer n
|
||||
horizontalScrollbarRenderer =
|
||||
ScrollbarRenderer { renderScrollbar = fill '█'
|
||||
, renderScrollbarTrough = fill ' '
|
||||
, renderScrollbarHandleBefore = str "<"
|
||||
, renderScrollbarHandleAfter = str ">"
|
||||
HScrollbarRenderer { renderHScrollbar = fill '█'
|
||||
, renderHScrollbarTrough = fill ' '
|
||||
, renderHScrollbarHandleBefore = str "<"
|
||||
, renderHScrollbarHandleAfter = str ">"
|
||||
, scrollbarHeightAllocation = 1
|
||||
}
|
||||
|
||||
-- | Render the specified widget in a named viewport with the
|
||||
@ -1373,11 +1376,11 @@ horizontalScrollbarRenderer =
|
||||
-- don't like the appearance of the resulting scroll bars (defaults:
|
||||
-- 'verticalScrollbarRenderer' and 'horizontalScrollbarRenderer'),
|
||||
-- you can customize how they are drawn by making your own
|
||||
-- 'ScrollbarRenderer' and using 'withVScrollBarRenderer' and/or
|
||||
-- 'withHScrollBarRenderer'. Note that when you enable scrollbars, the
|
||||
-- content of your viewport will lose one column of available space if
|
||||
-- vertical scroll bars are enabled and one row of available space if
|
||||
-- horizontal scroll bars are enabled.
|
||||
-- 'VScrollbarRenderer' or 'HScrollbarRenderer' and using
|
||||
-- 'withVScrollBarRenderer' and/or 'withHScrollBarRenderer'. Note that
|
||||
-- when you enable scrollbars, the content of your viewport will lose
|
||||
-- one column of available space if vertical scroll bars are enabled and
|
||||
-- one row of available space if horizontal scroll bars are enabled.
|
||||
--
|
||||
-- If a viewport receives more than one visibility request, then the
|
||||
-- visibility requests are merged with the inner visibility request
|
||||
@ -1441,8 +1444,8 @@ viewport vpname typ p =
|
||||
newSize = (newWidth, newHeight)
|
||||
newWidth = c^.availWidthL - vSBWidth
|
||||
newHeight = c^.availHeightL - hSBHeight
|
||||
vSBWidth = maybe 0 (const 1) vsOrientation
|
||||
hSBHeight = maybe 0 (const 1) hsOrientation
|
||||
vSBWidth = maybe 0 (const $ scrollbarWidthAllocation vsRenderer) vsOrientation
|
||||
hSBHeight = maybe 0 (const $ scrollbarHeightAllocation hsRenderer) hsOrientation
|
||||
doInsert (Just vp) = Just $ vp & vpSize .~ newSize
|
||||
doInsert Nothing = Just newVp
|
||||
|
||||
@ -1542,7 +1545,8 @@ viewport vpname typ p =
|
||||
let addVScrollbar = case vsOrientation of
|
||||
Nothing -> id
|
||||
Just orientation ->
|
||||
let sb = verticalScrollbar vsRenderer vpname
|
||||
let sb = verticalScrollbar vsRenderer orientation
|
||||
vpname
|
||||
vsbClickableConstr
|
||||
showVHandles
|
||||
(vpFinal^.vpSize._2)
|
||||
@ -1555,7 +1559,8 @@ viewport vpname typ p =
|
||||
addHScrollbar = case hsOrientation of
|
||||
Nothing -> id
|
||||
Just orientation ->
|
||||
let sb = horizontalScrollbar hsRenderer vpname
|
||||
let sb = horizontalScrollbar hsRenderer orientation
|
||||
vpname
|
||||
hsbClickableConstr
|
||||
showHHandles
|
||||
(vpFinal^.vpSize._1)
|
||||
@ -1609,7 +1614,7 @@ maybeClick :: (Ord n)
|
||||
maybeClick _ Nothing _ w = w
|
||||
maybeClick n (Just f) el w = clickable (f el n) w
|
||||
|
||||
-- | Build a vertical scroll bar using the specified render and
|
||||
-- | Build a vertical scroll bar using the specified renderer and
|
||||
-- settings.
|
||||
--
|
||||
-- You probably don't want to use this directly; instead,
|
||||
@ -1618,8 +1623,13 @@ maybeClick n (Just f) el w = clickable (f el n) w
|
||||
-- render a scroll bar of your own, you can do so outside the @viewport@
|
||||
-- context.
|
||||
verticalScrollbar :: (Ord n)
|
||||
=> ScrollbarRenderer n
|
||||
=> VScrollbarRenderer n
|
||||
-- ^ The renderer to use.
|
||||
-> VScrollBarOrientation
|
||||
-- ^ The scroll bar orientation. The orientation
|
||||
-- governs how additional padding is added to
|
||||
-- the scroll bar if it is smaller than it space
|
||||
-- allocation according to 'scrollbarWidthAllocation'.
|
||||
-> n
|
||||
-- ^ The viewport name associated with this scroll
|
||||
-- bar.
|
||||
@ -1634,24 +1644,35 @@ verticalScrollbar :: (Ord n)
|
||||
-> Int
|
||||
-- ^ The total viewport content height.
|
||||
-> Widget n
|
||||
verticalScrollbar vsRenderer n constr False vpHeight vOffset contentHeight =
|
||||
verticalScrollbar' vsRenderer n constr vpHeight vOffset contentHeight
|
||||
verticalScrollbar vsRenderer n constr True vpHeight vOffset contentHeight =
|
||||
vBox [ maybeClick n constr SBHandleBefore $
|
||||
hLimit 1 $ withDefAttr scrollbarHandleAttr $ renderScrollbarHandleBefore vsRenderer
|
||||
, verticalScrollbar' vsRenderer n constr vpHeight vOffset contentHeight
|
||||
, maybeClick n constr SBHandleAfter $
|
||||
hLimit 1 $ withDefAttr scrollbarHandleAttr $ renderScrollbarHandleAfter vsRenderer
|
||||
verticalScrollbar vsRenderer o n constr showHandles vpHeight vOffset contentHeight =
|
||||
hLimit (scrollbarWidthAllocation vsRenderer) $
|
||||
applyPadding $
|
||||
if showHandles
|
||||
then vBox [ vLimit 1 $
|
||||
maybeClick n constr SBHandleBefore $
|
||||
withDefAttr scrollbarHandleAttr $ renderVScrollbarHandleBefore vsRenderer
|
||||
, sbBody
|
||||
, vLimit 1 $
|
||||
maybeClick n constr SBHandleAfter $
|
||||
withDefAttr scrollbarHandleAttr $ renderVScrollbarHandleAfter vsRenderer
|
||||
]
|
||||
else sbBody
|
||||
where
|
||||
sbBody = verticalScrollbar' vsRenderer n constr vpHeight vOffset contentHeight
|
||||
applyPadding = case o of
|
||||
OnLeft -> padRight Max
|
||||
OnRight -> padLeft Max
|
||||
|
||||
verticalScrollbar' :: (Ord n)
|
||||
=> ScrollbarRenderer n
|
||||
=> VScrollbarRenderer n
|
||||
-- ^ The renderer to use.
|
||||
-> n
|
||||
-- ^ The viewport name associated with this scroll
|
||||
-- bar.
|
||||
-> Maybe (ClickableScrollbarElement -> n -> n)
|
||||
-- ^ Constructor for clickable scroll bar element names.
|
||||
-- ^ Constructor for clickable scroll bar element
|
||||
-- names. Will be given the element name and the
|
||||
-- viewport name.
|
||||
-> Int
|
||||
-- ^ The total viewport height in effect.
|
||||
-> Int
|
||||
@ -1660,7 +1681,7 @@ verticalScrollbar' :: (Ord n)
|
||||
-- ^ The total viewport content height.
|
||||
-> Widget n
|
||||
verticalScrollbar' vsRenderer _ _ vpHeight _ 0 =
|
||||
hLimit 1 $ vLimit vpHeight $ renderScrollbarTrough vsRenderer
|
||||
vLimit vpHeight $ renderVScrollbarTrough vsRenderer
|
||||
verticalScrollbar' vsRenderer n constr vpHeight vOffset contentHeight =
|
||||
Widget Fixed Greedy $ do
|
||||
c <- getContext
|
||||
@ -1692,22 +1713,21 @@ verticalScrollbar' vsRenderer n constr vpHeight vOffset contentHeight =
|
||||
|
||||
sbAbove = maybeClick n constr SBTroughBefore $
|
||||
withDefAttr scrollbarTroughAttr $ vLimit sbOffset $
|
||||
renderScrollbarTrough vsRenderer
|
||||
renderVScrollbarTrough vsRenderer
|
||||
sbBelow = maybeClick n constr SBTroughAfter $
|
||||
withDefAttr scrollbarTroughAttr $ vLimit (ctxHeight - (sbOffset + sbSize)) $
|
||||
renderScrollbarTrough vsRenderer
|
||||
renderVScrollbarTrough vsRenderer
|
||||
sbMiddle = maybeClick n constr SBBar $
|
||||
withDefAttr scrollbarAttr $ vLimit sbSize $ renderScrollbar vsRenderer
|
||||
withDefAttr scrollbarAttr $ vLimit sbSize $ renderVScrollbar vsRenderer
|
||||
|
||||
sb = hLimit 1 $
|
||||
if sbSize == ctxHeight
|
||||
sb = if sbSize == ctxHeight
|
||||
then vLimit sbSize $
|
||||
renderScrollbarTrough vsRenderer
|
||||
renderVScrollbarTrough vsRenderer
|
||||
else vBox [sbAbove, sbMiddle, sbBelow]
|
||||
|
||||
render sb
|
||||
|
||||
-- | Build a horizontal scroll bar using the specified render and
|
||||
-- | Build a horizontal scroll bar using the specified renderer and
|
||||
-- settings.
|
||||
--
|
||||
-- You probably don't want to use this directly; instead, use
|
||||
@ -1716,14 +1736,21 @@ verticalScrollbar' vsRenderer n constr vpHeight vOffset contentHeight =
|
||||
-- render a scroll bar of your own, you can do so outside the @viewport@
|
||||
-- context.
|
||||
horizontalScrollbar :: (Ord n)
|
||||
=> ScrollbarRenderer n
|
||||
=> HScrollbarRenderer n
|
||||
-- ^ The renderer to use.
|
||||
-> HScrollBarOrientation
|
||||
-- ^ The scroll bar orientation. The orientation
|
||||
-- governs how additional padding is added
|
||||
-- to the scroll bar if it is smaller
|
||||
-- than it space allocation according to
|
||||
-- 'scrollbarHeightAllocation'.
|
||||
-> n
|
||||
-- ^ The viewport name associated with this scroll
|
||||
-- bar.
|
||||
-> Maybe (ClickableScrollbarElement -> n -> n)
|
||||
-- ^ Constructor for clickable scroll bar element
|
||||
-- names.
|
||||
-- names. Will be given the element name and the
|
||||
-- viewport name.
|
||||
-> Bool
|
||||
-- ^ Whether to show handles.
|
||||
-> Int
|
||||
@ -1733,18 +1760,27 @@ horizontalScrollbar :: (Ord n)
|
||||
-> Int
|
||||
-- ^ The total viewport content width.
|
||||
-> Widget n
|
||||
horizontalScrollbar hsRenderer n constr False vpWidth hOffset contentWidth =
|
||||
horizontalScrollbar' hsRenderer n constr vpWidth hOffset contentWidth
|
||||
horizontalScrollbar hsRenderer n constr True vpWidth hOffset contentWidth =
|
||||
hBox [ maybeClick n constr SBHandleBefore $
|
||||
vLimit 1 $ withDefAttr scrollbarHandleAttr $ renderScrollbarHandleBefore hsRenderer
|
||||
, horizontalScrollbar' hsRenderer n constr vpWidth hOffset contentWidth
|
||||
, maybeClick n constr SBHandleAfter $
|
||||
vLimit 1 $ withDefAttr scrollbarHandleAttr $ renderScrollbarHandleAfter hsRenderer
|
||||
horizontalScrollbar hsRenderer o n constr showHandles vpWidth hOffset contentWidth =
|
||||
vLimit (scrollbarHeightAllocation hsRenderer) $
|
||||
applyPadding $
|
||||
if showHandles
|
||||
then hBox [ hLimit 1 $
|
||||
maybeClick n constr SBHandleBefore $
|
||||
withDefAttr scrollbarHandleAttr $ renderHScrollbarHandleBefore hsRenderer
|
||||
, sbBody
|
||||
, hLimit 1 $
|
||||
maybeClick n constr SBHandleAfter $
|
||||
withDefAttr scrollbarHandleAttr $ renderHScrollbarHandleAfter hsRenderer
|
||||
]
|
||||
else sbBody
|
||||
where
|
||||
sbBody = horizontalScrollbar' hsRenderer n constr vpWidth hOffset contentWidth
|
||||
applyPadding = case o of
|
||||
OnTop -> padBottom Max
|
||||
OnBottom -> padTop Max
|
||||
|
||||
horizontalScrollbar' :: (Ord n)
|
||||
=> ScrollbarRenderer n
|
||||
=> HScrollbarRenderer n
|
||||
-- ^ The renderer to use.
|
||||
-> n
|
||||
-- ^ The viewport name associated with this scroll
|
||||
@ -1760,7 +1796,7 @@ horizontalScrollbar' :: (Ord n)
|
||||
-- ^ The total viewport content width.
|
||||
-> Widget n
|
||||
horizontalScrollbar' hsRenderer _ _ vpWidth _ 0 =
|
||||
vLimit 1 $ hLimit vpWidth $ renderScrollbarTrough hsRenderer
|
||||
hLimit vpWidth $ renderHScrollbarTrough hsRenderer
|
||||
horizontalScrollbar' hsRenderer n constr vpWidth hOffset contentWidth =
|
||||
Widget Greedy Fixed $ do
|
||||
c <- getContext
|
||||
@ -1791,17 +1827,16 @@ horizontalScrollbar' hsRenderer n constr vpWidth hOffset contentWidth =
|
||||
|
||||
sbLeft = maybeClick n constr SBTroughBefore $
|
||||
withDefAttr scrollbarTroughAttr $ hLimit sbOffset $
|
||||
renderScrollbarTrough hsRenderer
|
||||
renderHScrollbarTrough hsRenderer
|
||||
sbRight = maybeClick n constr SBTroughAfter $
|
||||
withDefAttr scrollbarTroughAttr $ hLimit (ctxWidth - (sbOffset + sbSize)) $
|
||||
renderScrollbarTrough hsRenderer
|
||||
renderHScrollbarTrough hsRenderer
|
||||
sbMiddle = maybeClick n constr SBBar $
|
||||
withDefAttr scrollbarAttr $ hLimit sbSize $ renderScrollbar hsRenderer
|
||||
withDefAttr scrollbarAttr $ hLimit sbSize $ renderHScrollbar hsRenderer
|
||||
|
||||
sb = vLimit 1 $
|
||||
if sbSize == ctxWidth
|
||||
sb = if sbSize == ctxWidth
|
||||
then hLimit sbSize $
|
||||
renderScrollbarTrough hsRenderer
|
||||
renderHScrollbarTrough hsRenderer
|
||||
else hBox [sbLeft, sbMiddle, sbRight]
|
||||
|
||||
render sb
|
||||
|
Loading…
Reference in New Issue
Block a user