diff options
Diffstat (limited to 'src/Chelleport')
| -rw-r--r-- | src/Chelleport/AppShell.hs | 4 | ||||
| -rw-r--r-- | src/Chelleport/Context.hs | 4 | ||||
| -rw-r--r-- | src/Chelleport/Types.hs | 2 | ||||
| -rw-r--r-- | src/Chelleport/View.hs | 11 |
4 files changed, 12 insertions, 9 deletions
diff --git a/src/Chelleport/AppShell.hs b/src/Chelleport/AppShell.hs index 9b8a284..0a5bdfe 100644 --- a/src/Chelleport/AppShell.hs +++ b/src/Chelleport/AppShell.hs @@ -1,6 +1,6 @@ module Chelleport.AppShell where -import Chelleport.Context (createContext) +import Chelleport.Context (initializeContext) import Chelleport.Draw (colorBackground) import Chelleport.Types import Control.Monad (foldM, unless) @@ -25,7 +25,7 @@ setupAppShell initState update eventHandler draw = do SDL.initializeAll TTF.initialize - ctx <- createContext + ctx <- initializeContext state <- initState ctx appLoop ctx (state, SysState {sysExit = False}) diff --git a/src/Chelleport/Context.hs b/src/Chelleport/Context.hs index d62cd7e..9b1e13e 100644 --- a/src/Chelleport/Context.hs +++ b/src/Chelleport/Context.hs @@ -6,8 +6,8 @@ import SDL (($=)) import qualified SDL import qualified SDL.Font as TTF -createContext :: IO DrawContext -createContext = do +initializeContext :: IO DrawContext +initializeContext = do let windowCfg = SDL.defaultWindow { SDL.windowMode = SDL.FullscreenDesktop, diff --git a/src/Chelleport/Types.hs b/src/Chelleport/Types.hs index 766348b..8f69e72 100644 --- a/src/Chelleport/Types.hs +++ b/src/Chelleport/Types.hs @@ -15,7 +15,7 @@ data State = State stateKeySequence :: KeySequence } -data AppAction = FilterSequence SDL.Keycode | TriggerLeftClick | SetupGrid +data AppAction = FilterSequence SDL.Keycode | TriggerLeftClick | ResetKeys data DrawContext = DrawContext { ctxWindow :: SDL.Window, diff --git a/src/Chelleport/View.hs b/src/Chelleport/View.hs index f1e941f..cf51390 100644 --- a/src/Chelleport/View.hs +++ b/src/Chelleport/View.hs @@ -11,6 +11,9 @@ import SDL (($=)) import qualified SDL import Unsafe.Coerce (unsafeCoerce) +isEmpty :: [a] -> Bool +isEmpty = null + render :: State -> DrawContext -> IO () render state ctx = do renderGridLines state ctx @@ -33,16 +36,16 @@ renderKeySequence ctx keySequence cell (px, py) = do | otherwise = ("", cell) let textColor - | null keySequence = colorWhite - | not (null matched) = colorAccent + | isEmpty keySequence = colorWhite + | not $ isEmpty matched = colorAccent | otherwise = colorGray widthRef <- newIORef 0 - unless (null matched) $ do + unless (isEmpty matched) $ do (textWidth, _h) <- drawText ctx (SDL.V2 px py) colorLightGray $ Text.pack matched modifyIORef' widthRef (const textWidth) - unless (null remaining) $ do + unless (isEmpty remaining) $ do prevTextWidth <- readIORef widthRef let pos = px + prevTextWidth void $ drawText ctx (SDL.V2 pos py) textColor $ Text.pack remaining |
