justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix bug not allowing dragging at extreme bottom edge

Browse Source
This commit is contained in:
justin
2024-11-25 20:41:30 +00:00
parent 3c75b78803
commit 00d8190ffc
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ghcidOutput
+1 -1
View File
@@ -1 +1 @@
All good (594 modules, at 20:03:59) All good (594 modules, at 20:39:56)
src/Dodge/TestString.hs
+16
View File
@@ -1,6 +1,9 @@
{-# OPTIONS_GHC -Wno-unused-imports #-} {-# OPTIONS_GHC -Wno-unused-imports #-}
module Dodge.TestString where module Dodge.TestString where
import Linear
import Dodge.ListDisplayParams
import Dodge.SelectionSections
import qualified Control.Foldl as L import qualified Control.Foldl as L
import Dodge.DoubleTree import Dodge.DoubleTree
import Dodge.Data.DoubleTree import Dodge.Data.DoubleTree
@@ -24,7 +27,20 @@ testStringInit :: Universe -> [String]
testStringInit u = testStringInit u =
[ show $ u ^? uvWorld . input . mouseContext . mcoSelEnd [ show $ u ^? uvWorld . input . mouseContext . mcoSelEnd
, show $ u ^? uvWorld . hud . hudElement . diSelection , show $ u ^? uvWorld . hud . hudElement . diSelection
, show $ u ^? uvWorld . input . mouseContext
, show $ u ^? uvWorld . input . mouseContext . mcoDragSection
, show $ u ^? uvWorld . input . mouseContext . mcoMaybeSelect
, show $ u ^? uvWorld . input . mouseContext . mcoAboveSelect
, show $ u ^? uvWorld . input . mouseContext . mcoBelowSelect
, show mpos
, show yint
, show $ u ^? uvWorld . hud . hudElement . diSections >>= inverseSelSecYint yint
] ]
where
idp = invDisplayParams $ u ^. uvWorld
cfig = u ^. uvConfig
yint = posSelSecYint cfig idp y
mpos@(V2 _ y) = u ^. uvWorld . input . mousePos
-- , show . fmap (fmap _siPictures) $ u ^? uvWorld . hud . hudElement . diSections . ix (-1) . ssItems -- , show . fmap (fmap _siPictures) $ u ^? uvWorld . hud . hudElement . diSections . ix (-1) . ssItems
-- <> [[toEnum (i+j * 32) | i <- [0..31]] | j <- [0..7]] -- <> [[toEnum (i+j * 32) | i <- [0..31]] | j <- [0..7]]
-- <> map show (IM.elems (L.postscan (L.premap _siHeight L.sum) -- <> map show (IM.elems (L.postscan (L.premap _siHeight L.sum)
src/Dodge/Update/Input/InGame.hs
+1 -1
View File
@@ -292,7 +292,7 @@ shiftInvItems k x ab bn xs ss w = setSelWhileDragging . fromMaybe w $ do
return $ shiftInvItemsUp k xs w return $ shiftInvItemsUp k xs w
else do else do
guard $ not . null . snd $ IM.split maxi ss guard $ not . null . snd $ IM.split maxi ss
guard $ Just (k,maxi+1) < bn guard $ Just (k,maxi+1) /= bn
return $ shiftInvItemsDown k xs w return $ shiftInvItemsDown k xs w
setSelWhileDragging :: World -> World setSelWhileDragging :: World -> World