From 7498d591f553ac9faf5f5cd8985957534ff20601 Mon Sep 17 00:00:00 2001 From: Steven Vandevelde Date: Thu, 4 Apr 2019 20:08:59 +0200 Subject: [PATCH] Improve overlay interaction --- src/Applications/UI.elm | 53 ++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/src/Applications/UI.elm b/src/Applications/UI.elm index cb229b4c..1202139e 100644 --- a/src/Applications/UI.elm +++ b/src/Applications/UI.elm @@ -684,18 +684,20 @@ view model = body : Model -> Html Msg body model = section - (case model.equalizer.activeKnob of - Just _ -> - [ (EqualizerMsg << Equalizer.AdjustKnob) - |> Pointer.onMove - |> Html.Styled.Attributes.fromUnstyled - , (EqualizerMsg << Equalizer.DeactivateKnob) - |> Pointer.onUp - |> Html.Styled.Attributes.fromUnstyled - ] + (if Maybe.isJust model.contextMenu then + [ onClick HideContextMenu ] + + else if Maybe.isJust model.equalizer.activeKnob then + [ (EqualizerMsg << Equalizer.AdjustKnob) + |> Pointer.onMove + |> Html.Styled.Attributes.fromUnstyled + , (EqualizerMsg << Equalizer.DeactivateKnob) + |> Pointer.onUp + |> Html.Styled.Attributes.fromUnstyled + ] - Nothing -> - [] + else + [] ) [ Css.Global.global globalCss @@ -821,22 +823,14 @@ loadingAnimation = overlay : Maybe (ContextMenu Msg) -> Html Msg overlay maybeContextMenu = - let - isVisible = - Maybe.isJust maybeContextMenu - in brick - [ css (overlayStyles { clickable = isVisible }) - - -- - , ifThenElse isVisible (onClick HideContextMenu) (onClick Bypass) - ] + [ css overlayStyles ] [ T.absolute , T.absolute__fill , T.z_999 -- - , ifThenElse isVisible T.o_100 T.o_0 + , ifThenElse (Maybe.isJust maybeContextMenu) T.o_100 T.o_0 ] [] @@ -889,21 +883,10 @@ placeholderStyles = -- 🖼 ░░ OTHER -overlayStyles : { clickable : Bool } -> List Css.Style -overlayStyles { clickable } = +overlayStyles : List Css.Style +overlayStyles = [ Css.backgroundColor (Css.rgba 0 0 0 0.25) - - -- - , ifThenElse - clickable - (Css.pointerEvents Css.auto) - (Css.pointerEvents Css.none) - - -- - , ifThenElse - clickable - (Css.cursor Css.pointer) - (Css.cursor Css.inherit) + , Css.pointerEvents Css.none -- , Css.Transitions.transition -- 2.54.0