Cleanup
This commit is contained in:
+4
-3
@@ -136,7 +136,7 @@ maybeOpenConsole u = case u ^. uvWorld . input . pressedKeys . at ScancodeSemico
|
||||
openConsole :: [ScreenLayer] -> [ScreenLayer]
|
||||
openConsole = \case
|
||||
xs@(InputScreen{} : _) -> xs
|
||||
xs -> InputScreen mempty "Enter command" : xs
|
||||
xs -> InputScreen mempty : xs
|
||||
|
||||
updateUniverseLast :: Universe -> Universe
|
||||
updateUniverseLast u =
|
||||
@@ -348,7 +348,7 @@ updateMouseContextGame :: Config -> Universe -> MouseContext -> MouseContext
|
||||
updateMouseContextGame cfig u = \case
|
||||
OverInvDrag i _ -> OverInvDrag i (inverseSelNumPos cfig invDP mpos disss)
|
||||
x@OverInvDragSelect{} -> x
|
||||
_ -> fromMaybe aimcontext (isrotatedrag <|> overinv <|> overcomb <|> overterm)
|
||||
_ -> fromMaybe aimcontext (isrotatedrag <|> overterm <|> overinv <|> overcomb)
|
||||
where
|
||||
w = u ^. uvWorld
|
||||
isrotatedrag = do
|
||||
@@ -406,7 +406,8 @@ isOverTerminalScreen cfig (V2 x y) =
|
||||
&& y <= ymax + 5
|
||||
&& y >= ymin
|
||||
where
|
||||
ldp = secondColumnLDP
|
||||
--ldp = secondColumnLDP
|
||||
ldp = invDP
|
||||
V2 xmin ymax = screenPosAbs cfig (ldp ^. ldpPos)
|
||||
tsize = fromIntegral $ getMaxLinesTM + 1
|
||||
s = 5 + tsize * (20 * ldp ^. ldpScale + ldp ^. ldpVerticalGap)
|
||||
|
||||
Reference in New Issue
Block a user