Tweak terminal screen drawing
This commit is contained in:
+11
-4
@@ -372,10 +372,16 @@ drawTerminalDisplay w cfig tid = fold $ do
|
||||
TerminalLineRead -> (++ [(spincurs, termTextColor)])
|
||||
TerminalTextInput s -> (++ [(getPromptTM ++ s ++ [cFilledRect], white)])
|
||||
TerminalPressTo s -> (++ [(s, white)])
|
||||
return $
|
||||
return . (each . vxPos . _z -~ 0.05) $
|
||||
drawTerminalCursorLink w cfig tm
|
||||
<> (
|
||||
drawSelectionList (w ^. tmLDP) cfig f
|
||||
<> drawTerminalCursorLink w cfig tm
|
||||
<> (hackInvertText black white ("TERMINAL-" ++ show tid)
|
||||
& each . vxPos *~ 0.1
|
||||
& each . vxPos . _xy +~ rp)
|
||||
& each . vxPos . _z -~ 0.05)
|
||||
where
|
||||
rp = screenPosAbs cfig (w ^. tmLDP . ldpPos)
|
||||
-- <> invHead cfig ("TERMINAL-" ++ show tid)
|
||||
-- <> color
|
||||
-- (withAlpha 0.5 green) -- consider integrating termScreenColor somehow
|
||||
@@ -391,7 +397,7 @@ drawTerminalCursorLink :: World -> Config -> Terminal -> Picture
|
||||
drawTerminalCursorLink w cfig tm = fold $ do
|
||||
j <- elemIndex (tm ^. tmButtonID) $ w ^. hud . closeButtons
|
||||
lp <- selNumPos cfig invDP (w ^. hud . diSections) 5 j
|
||||
let rp = screenPosAbs cfig (secondColumnLDP ^. ldpPos) - V2 5 10
|
||||
let rp = screenPosAbs cfig (w ^. tmLDP . ldpPos)
|
||||
lcol <- selSecSelCol 5 j (w ^. hud . diSections)
|
||||
return $
|
||||
translateScreenPos
|
||||
@@ -403,7 +409,8 @@ drawTerminalCursorLink w cfig tm = fold $ do
|
||||
(w ^. hud . diSections)
|
||||
(Sel 5 j mempty)
|
||||
)
|
||||
<> lConnectCol (lp + V2 155 0) rp lcol white white
|
||||
<>
|
||||
lConnectCol (lp + V2 155 0) rp lcol white white
|
||||
|
||||
lnkMidPosInvSelsCol :: Config -> World -> Int -> Color -> [Int] -> Picture
|
||||
lnkMidPosInvSelsCol cfig w i col = fromMaybe mempty . foldMap f
|
||||
|
||||
Reference in New Issue
Block a user