Move combine list over to SelectionSections -- more todo

2023-02-18 10:59:59 +00:00
parent 36b9b5445c
commit 6eca3bab38
10 changed files with 119 additions and 160 deletions
@@ -32,12 +32,9 @@ inCloseRegex w = fromMaybe False $ do

 inSubInvRegex  :: World -> Bool
 inSubInvRegex w = fromMaybe False $ do
-        sm <- w ^? hud . hudElement . subInventory . subInvMap
-        i <- sm ^? smSelPos . _Just
-        si <- sm ^? smShownItems . ix i
-        case si of
-            SelectionRegex {} -> return True
-            _ -> return False
+        sss <- w ^? hud . hudElement . subInventory . ciSections
+        i <- sss ^? sssSelPos . _Just
+        return $ i == (-1)

 inputFocus :: World -> Bool
 inputFocus w = inTermFocus w || inSubInvRegex w || inInvRegex w || inCloseRegex w