justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Cleanup (somewhat) mouseClickOptionsList

Browse Source
This commit is contained in:
justin
2024-11-25 22:54:45 +00:00
parent 0fb6c3ec26
commit d8d30e0192
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Update/Input/ScreenLayer.hs
+22 -9
View File
@@ -3,8 +3,8 @@ module Dodge.Update.Input.ScreenLayer (
ldpVerticalSelection, ldpVerticalSelection,
) where ) where
import Data.Char
import Control.Monad import Control.Monad
import Data.Char
import qualified Data.Map.Strict as M import qualified Data.Map.Strict as M
import Data.Maybe import Data.Maybe
import Dodge.Data.ScreenPos import Dodge.Data.ScreenPos
@@ -58,17 +58,30 @@ optionScreenDefaultEffect u = fromMaybe u $ do
mouseClickOptionsList :: Universe -> Universe mouseClickOptionsList :: Universe -> Universe
mouseClickOptionsList u = fromMaybe u $ do mouseClickOptionsList u = fromMaybe u $ do
sl <- u ^? uvScreenLayers . ix 0 . scSelectionList sl <- u ^? uvScreenLayers . ix 0 . scSelectionList
Just $ case u ^. uvWorld . input . mouseButtons . at ButtonLeft of case u ^. uvWorld . input . mouseButtons of
Just 0 -> fromMaybe u $ do mbs | mbs ^. at ButtonLeft == Just 0 -> do
i <- u ^? uvWorld . input . mouseContext . mcoMenuClick i <- u ^? uvWorld . input . mouseContext . mcoMenuClick
f <- sl ^? ix i . siPayload . _1 f <- sl ^? ix i . siPayload . _1
return $ f u return $ f u
_ -> case u ^. uvWorld . input . mouseButtons . at ButtonRight of mbs | mbs ^. at ButtonRight == Just 0 -> do
Just 0 -> fromMaybe u $ do i <- u ^? uvWorld . input . mouseContext . mcoMenuClick
i <- u ^? uvWorld . input . mouseContext . mcoMenuClick f <- sl ^? ix i . siPayload . _2
f <- sl ^? ix i . siPayload . _2 return $ f u
return $ f u _ -> Nothing
_ -> u
--mouseClickOptionsList u = fromMaybe u $ do
-- sl <- u ^? uvScreenLayers . ix 0 . scSelectionList
-- Just $ case u ^. uvWorld . input . mouseButtons . at ButtonLeft of
-- Just 0 -> fromMaybe u $ do
-- i <- u ^? uvWorld . input . mouseContext . mcoMenuClick
-- f <- sl ^? ix i . siPayload . _1
-- return $ f u
-- _ -> case u ^. uvWorld . input . mouseButtons . at ButtonRight of
-- Just 0 -> fromMaybe u $ do
-- i <- u ^? uvWorld . input . mouseContext . mcoMenuClick
-- f <- sl ^? ix i . siPayload . _2
-- return $ f u
-- _ -> u
ldpVerticalSelection :: Configuration -> ListDisplayParams -> Point2 -> Maybe Int ldpVerticalSelection :: Configuration -> ListDisplayParams -> Point2 -> Maybe Int
ldpVerticalSelection cfig ldp (V2 _ y) ldpVerticalSelection cfig ldp (V2 _ y)