Refactor window size, update selection cursor on new screen

src/Dodge/Update/Input/ScreenLayer.hs

@@ -17,8 +17,7 @@ import SDL
 updateUseInputOnScreen :: ScreenLayer -> Universe -> Universe
 updateUseInputOnScreen sl = case sl of
     InputScreen thetext _ -> doInputScreenInput thetext
-    screen@OptionScreen{_scPositionedMenuOption = mop, _scSelectionList = sellist, _scListDisplayParams = ldps} ->
-        optionScreenUpdate screen mop ldps sellist
+    screen -> optionScreenUpdate screen
 
 doInputScreenInput :: String -> Universe -> Universe
 doInputScreenInput s u =
@@ -36,19 +35,20 @@ doInputScreenInput s u =
 
 optionScreenUpdate ::
     ScreenLayer ->
-    PositionedMenuOption ->
-    ListDisplayParams ->
-    SelectionList (Universe -> Universe,Universe -> Universe) ->
     Universe ->
     Universe
-optionScreenUpdate screen mop ldps sl u =
-    refreshOptionsSelectionList
+optionScreenUpdate screen u =
+    (uvScreenLayers . ix 0 . scDisplayTime +~ 1)
+        . refreshOptionsSelectionList
         . optionScreenDefaultEffect mop
         . mouseClickOptionsList screen
-        . mouseOverSelectionList ldps sl
+        . mouseOverSelectionList ldps screen
         . menuWheelEvents
         . over (uvScreenLayers . _head) (setSelectionListRestriction (u ^. uvConfig))
         $ u
+  where
+    mop = _scPositionedMenuOption screen
+    ldps = _scListDisplayParams screen
 
 optionScreenDefaultEffect :: PositionedMenuOption -> Universe -> Universe
 optionScreenDefaultEffect f u = case u ^. uvWorld . input . pressedKeys . at ScancodeEscape of
@@ -71,18 +71,22 @@ mouseClickOptionsList screen u = fromMaybe u $ do
                 return $ f u
             _ -> u
 
-mouseOverSelectionList :: ListDisplayParams 
-    -> SelectionList a -> Universe -> Universe
-mouseOverSelectionList ldps sl u
+mouseOverSelectionList ::
+    ListDisplayParams ->
+    ScreenLayer ->
+    Universe ->
+    Universe
+mouseOverSelectionList ldps screen u
     | x > xl && x < xr
         && ylower == yupper
-        && mmoving
+        && (mmoving || (_scDisplayTime screen == 0))
         && ylower >= 0
         && ylower < ymax
         && isselectable =
         u & uvScreenLayers . _head . scSelectionList . slSelPos ?~ yupper
     | otherwise = u
   where
+    sl = _scSelectionList screen
     isselectable =
         fromMaybe False $
             u ^? uvScreenLayers . _head . scSelectionList . slItems . ix yupper . siIsSelectable
@@ -91,7 +95,6 @@ mouseOverSelectionList ldps sl u
     ylower = ceiling $ (hh - (75 + y + _ldpPosY ldps)) / 50
     yupper = floor $ (hh - (15 + y + _ldpPosY ldps)) / 50
     xl = _ldpPosX ldps - hw
-    --xr = xl + _ldpScale ldps * 15 * 9
     xr = xl + _ldpScale ldps * 26 * 9
     V2 x y = u ^. uvWorld . input . mousePos
     cfig = u ^. uvConfig