diff --git a/src/Dodge/ListDisplayParams.hs b/src/Dodge/ListDisplayParams.hs index 85e3a2ad0..1c7295dd5 100644 --- a/src/Dodge/ListDisplayParams.hs +++ b/src/Dodge/ListDisplayParams.hs @@ -47,6 +47,8 @@ secondColumnLDP = defaultLDP & ldpPos . spPixelOff .~ V2 subInvX (-20) terminalLDP :: LDParams terminalLDP = secondColumnLDP & ldpSize ?~ V2 50 16 + & ldpPos . spScreenOff .~ V2 0.5 0.5 + & ldpPos . spPixelOff .~ V2 (-250) (-40) subInvX :: Float subInvX = 10 * fromIntegral topInvW + 170 diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 5c2f35f6f..5967c21f5 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -134,8 +134,11 @@ setPixelOffsetBounded cfig (V2 x y) ldp = ldp & ldpPos . spPixelOff .~ V2 x' y' where h = fromIntegral $ cfig ^. windowY w = fromIntegral $ cfig ^. windowX - x' = min (w - (1+10*ldp ^?! ldpSize . _Just . _x . to fromIntegral)) $ max 1 x - y' = max (1+20*(ldp^.ldpVerticalGap + ldp^?!ldpSize._Just._y.to fromIntegral)-h) y + x' = min (w - (w*a + 1+10*ldp ^?! ldpSize . _Just . _x . to fromIntegral)) + $ max (1 - w * a) x + y' = min (h-(h*b + 40)) + $ max (1+20*(ldp^.ldpVerticalGap + ldp^?!ldpSize._Just._y.to fromIntegral)-h*b) y + V2 a b = ldp ^. ldpPos . spScreenOff --leftHeldPosShift :: World -> Point2 --leftHeldPosShift w = fromMaybe 0 $ do