Allow dragging after single click

ghcidOutput

@@ -1 +1 @@
-All good (593 modules, at 11:22:57)
+All good (593 modules, at 12:39:43)

src/Dodge/Update.hs

@@ -166,8 +166,12 @@ updateUniverseMid u = case _uvScreenLayers u of
                     . updateClouds
                )
     (sl : _) -> u & updateUseInputOnScreen sl
-    [] -> timeFlowUpdate . updateUseInputInGame $ over uvWorld 
+    [] ->
-        (updateMouseInGame (u ^. uvConfig)) u
+        timeFlowUpdate . updateUseInputInGame $
+            over
+                uvWorld
+                (updateMouseInGame (u ^. uvConfig))
+                u
 
 timeFlowUpdate :: Universe -> Universe
 timeFlowUpdate u = case u ^. uvWorld . timeFlow of
@@ -308,7 +312,8 @@ updateMouseContext :: Configuration -> Universe -> Universe
 updateMouseContext cfig u = case u ^. uvWorld . input . mouseContext of
     OverInvDrag i _ _ _ -> u & uvWorld . input . mouseContext .~ invdrag i
     OverInvDragSelect{} -> u
-    _ -> u & uvWorld . input . mouseContext
+    _ ->
+        u & uvWorld . input . mouseContext
             .~ fromMaybe
                 aimcontext
                 (overmenu <|> overinv <|> overcomb <|> overterm)
@@ -320,7 +325,11 @@ updateMouseContext cfig u = case u ^. uvWorld . input . mouseContext of
             _ -> fromMaybe MouseMenuCursor $ do
                 ldps <- screen ^? scListDisplayParams
                 let ymax = maybe 0 length $ screen ^? scSelectionList
-                yi <- ldpVerticalSelection (u ^. uvConfig) ldps (u ^. uvWorld . input . mousePos)
+                yi <-
+                    ldpVerticalSelection
+                        (u ^. uvConfig)
+                        ldps
+                        (u ^. uvWorld . input . mousePos)
                 guard (yi >= 0 && yi < ymax)
                 return $
                     if isselectable yi
@@ -329,7 +338,6 @@ updateMouseContext cfig u = case u ^. uvWorld . input . mouseContext of
     isselectable yi =
         fromMaybe False $
             u ^? uvScreenLayers . _head . scSelectionList . ix yi . siIsSelectable
-    --    mmoving = u ^. uvWorld . input . mouseMoving
     w = u ^. uvWorld
     aimcontext
         | ButtonRight `M.member` (w ^. input . mouseButtons) = MouseAiming
@@ -364,8 +372,7 @@ updateMouseContext cfig u = case u ^. uvWorld . input . mouseContext of
         tm <- w ^? cWorld . lWorld . terminals . ix tmid
         return $
             if isOverTerminalScreen cfig tm mpos
-                then
+                then fromMaybe NoMouseContext $ do
-                    fromMaybe NoMouseContext $ do
                     let s = tm ^. tmInput . tiText
                     guard $ not (null s) && _tmStatus tm == TerminalReady
                     return $ OverTerminalReturn tmid

src/Dodge/Update/Input/InGame.hs

@@ -205,7 +205,7 @@ startDrag (a, b) cfig w = fromMaybe (augInvDirectSelect (a, b) $ setmichosen mem
     setmichosen :: IS.IntSet -> World -> World
     setmichosen x =
         (input . mouseContext .~ OverInvDrag a (Just (a, b)) above bneath)
-            . (hud . hudElement . diSelectionExtra .~ x)
+            . (hud . hudElement . diSelectionExtra .~ IS.insert b x)
     above :: Maybe (Int,Int)
     above = do
         sss <- w ^? hud . hudElement . diSections