Cleanup
This commit is contained in:
+3
-3
@@ -96,7 +96,7 @@ handlePressedMouseButton but w = case (_hudElement (_hud w), but) of
|
||||
(DisplayCarte,_) -> w & clickMousePos .~ _mousePos w
|
||||
(_,ButtonMiddle) -> w & clickMousePos .~ _mousePos w
|
||||
( DisplayInventory (DisplayTerminal tmid) , ButtonLeft)
|
||||
| hasTerminalFocus w -> doTerminalEffectLB (w ^?! terminals . ix tmid) w
|
||||
| inTermFocus w -> doTerminalEffectLB (w ^?! terminals . ix tmid) w
|
||||
| otherwise -> w & terminals . ix tmid . tmInput . tiFocus %~ const True
|
||||
( DisplayInventory (CombineInventory mi) , ButtonLeft)
|
||||
-> maybe (hud . hudElement .~ DisplayInventory NoSubInventory) doCombine mi w
|
||||
@@ -144,9 +144,9 @@ wheelEvent y w = case _hudElement $ _hud w of
|
||||
DisplayInventory (CombineInventory _) -> w
|
||||
& hud . hudElement . subInventory . combineInvSel . _Just %~ ((`mod` numcombs) . subtract yi)
|
||||
DisplayInventory (DisplayTerminal tmid)
|
||||
| rbDown && hasTerminalFocus w -> w
|
||||
| rbDown && inTermFocus w -> w
|
||||
& terminals . ix tmid %~ updatetermsubsel
|
||||
| hasTerminalFocus w -> w
|
||||
| inTermFocus w -> w
|
||||
& terminals . ix tmid %~ updatetermsel
|
||||
_ -> w
|
||||
where
|
||||
|
||||
Reference in New Issue
Block a user