Skip to content

Commit a689f9d

Browse files
warning cleanup 1
1 parent 3c66944 commit a689f9d

File tree

13 files changed

+24
-51
lines changed

13 files changed

+24
-51
lines changed

TODO.txt

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -276,25 +276,8 @@ DONE-handlers should return preview action
276276
-update tutorial file?
277277
-should be more intuitive to get a 1 sided line
278278
-opening file with hidden elements does not hide stuff..
279-
DONE-hide stuff
280-
-moving an element into a hidden folder does not hide it right away (ignore this for release)
281-
-this is becaues it gets added to superowlchanges
282-
-moving a hidden folder (in folder hierarchy) shows it (maybe cuz it's selected ,but it does'nt look selected?? and also deselecitng doesn't hide it)
283-
-this is becaues it gets added to superowlchanges
284-
DONE-layers improvements
285-
DONE-when dragging into a folder, the | should then L to the element being moved
286-
DONE-currently not possible to drag the last element in folder outside of that folder if there's something below it
287-
-the trick is if you drag the last element in a folder to the spot below it, you need exception case to move it outside of the folder rather than as the next sibling to itself since that doesn't do anything
288-
DONE-currently not possible to drag below a folder if the folder is thet last sibling :(
289-
-not sure if there's a way around this :(
290-
DONE-DO THIS you might want to consider doing the thing where dragging to the right side of a folder puts it underneath, otherwise it's always a SiblingPosition
291-
DONE-selecting multiple items in layers and click on on should select that one item, but right now it gose into rename mode
292-
DONE/IGNORE-BUG translating lines should translate midpoints too
293-
DONE-text box option that auto goes into edit text box
294-
295279

296280
::NEWEST TODO::
297-
DONE-render testing utilities
298281
-layers improvements
299282
-shift select in layers please ;__;
300283
-selecting multiple items and hitting new folder should put those items in folder maybe
@@ -432,6 +415,22 @@ DONE-render testing utilities
432415
-you need some kind of options object to go along side of _setPotatoDefaultParameters_sBoxType
433416

434417

418+
DONE-hide stuff
419+
-moving an element into a hidden folder does not hide it right away (ignore this for release)
420+
-this is becaues it gets added to superowlchanges
421+
-moving a hidden folder (in folder hierarchy) shows it (maybe cuz it's selected ,but it does'nt look selected?? and also deselecitng doesn't hide it)
422+
-this is becaues it gets added to superowlchanges
423+
DONE-layers improvements
424+
DONE-when dragging into a folder, the | should then L to the element being moved
425+
DONE-currently not possible to drag the last element in folder outside of that folder if there's something below it
426+
-the trick is if you drag the last element in a folder to the spot below it, you need exception case to move it outside of the folder rather than as the next sibling to itself since that doesn't do anything
427+
DONE-currently not possible to drag below a folder if the folder is thet last sibling :(
428+
-not sure if there's a way around this :(
429+
DONE-DO THIS you might want to consider doing the thing where dragging to the right side of a folder puts it underneath, otherwise it's always a SiblingPosition
430+
DONE-selecting multiple items in layers and click on on should select that one item, but right now it gose into rename mode
431+
DONE/IGNORE-BUG translating lines should translate midpoints too
432+
DONE-text box option that auto goes into edit text box
433+
DONE-render testing utilities
435434
DONE-empty text zipper should return '' span with cursor
436435
-without this, empty cells don't show the cursor...
437436
-NO this is not the issue :()

src/Potato/Flow/Owl.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ instance HasOwlItem SuperOwl where
122122

123123
type SuperOwlChanges = REltIdMap (Maybe SuperOwl)
124124

125+
125126
instance PotatoShow SuperOwlChanges where
126127
potatoShow = (<>) "SuperOwlChanges:\n" . foldr (\msowl acc -> maybe "Nothing" potatoShow msowl <> "\n" <> acc) ""
127128

src/Potato/Flow/Types.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import qualified Text.Show
6767

6868

6969

70+
7071
type LayerPos = Int
7172
type REltIdMap a = IM.IntMap a
7273
type SuperSEltLabel = (REltId, LayerPos, SEltLabel)

test/Potato/Flow/AttachmentsSpec.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import Relude hiding (empty, fromList)
99
import Test.Hspec
1010

1111
import Potato.Flow.Attachments
12-
import Potato.Flow.Methods.LineDrawer
13-
import Potato.Flow.Methods.LineTypes
1412
import Potato.Flow.Math
1513
import Potato.Flow.Serialization.Snake
1614

test/Potato/Flow/Controller/GeneralSpec.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ import Potato.Flow.GoatTester
1515
import Potato.Flow
1616
import Potato.Flow.Controller.Manipulator.TestHelpers
1717

18-
import qualified Data.List as L
19-
import qualified Data.Sequence as Seq
20-
import Data.Default
21-
2218
verifyHasUnsavedChanges :: Bool -> GoatTester ()
2319
verifyHasUnsavedChanges b = do
2420
gs <- getGoatState

test/Potato/Flow/Controller/Manipulator/BoxSpec.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import Test.Hspec
1313
import Potato.Flow.GoatTester
1414

1515
import Potato.Flow
16-
import Potato.Flow.Common
1716
import Potato.Flow.Controller.Manipulator.TestHelpers
1817

1918

test/Potato/Flow/Controller/Manipulator/LayersSpec.hs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ import Relude hiding (empty,
1111
import Test.Hspec
1212

1313
import Potato.Flow.GoatTester
14-
1514
import Potato.Flow
1615
import Potato.Flow.Controller.Manipulator.TestHelpers
1716

18-
import qualified Data.List as L
1917
import qualified Data.Sequence as Seq
20-
import Control.Monad (forM_)
18+
2119

2220

2321
someFolderName :: Text

test/Potato/Flow/Controller/Manipulator/TestHelpers.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ drawCanvasBox (x, y, sx, sy) = do
1616
let
1717
f sowl = case _superOwl_elt sowl of
1818
OwlItem _ (OwlSubItemBox _) -> Nothing
19-
x -> Just ("expected box, got " <> show x)
19+
xx -> Just ("expected box, got " <> show xx)
2020
verifySelectionIsAndOnlyIs "box is selected" f
2121

2222

test/Potato/Flow/Deprecated/Controller/EverythingWidgetSpec.hs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -284,26 +284,6 @@ everything_keyboard_test = constructTest "keyboard" owlpfstate_basic1 bs expecte
284284

285285
]
286286

287-
-- TODO FINISH
288-
everything_newfolder_test :: Test
289-
everything_newfolder_test = constructTest "new folder" owlpfstate_basic1 bs expected where
290-
bs = [
291-
EWCLabel "New Folder (no selection)"
292-
, EWCNewFolder
293-
294-
, EWCLabel "New Folder (with selection)"
295-
-- TODO open up some folder, and select some stuff
296-
--, EWCNewFolder
297-
]
298-
expected = [
299-
LabelCheck "New Folder (no selection)"
300-
, firstSelectedSuperOwlPredicate (Just "<folder>") (\sowl -> case hasOwlItem_toSElt_hack sowl of
301-
SEltFolderStart -> True
302-
_ -> False)
303-
304-
, LabelCheck "New Folder (with selection)"
305-
]
306-
307287
moveOffset :: Int
308288
moveOffset = 100
309289

test/Potato/Flow/GoatTester.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,4 +414,4 @@ debugFailWithRenderedCanvas = do
414414
gs <- getGoatState
415415
let
416416
canvas = _goatState_renderedCanvas gs
417-
putRecord "debugFailWithRenderedCanvas" (traceShow (renderedCanvas_box canvas) $ Just $ renderedCanvasToText canvas)
417+
putRecord "debugFailWithRenderedCanvas" (Just $ renderedCanvasToText canvas)

0 commit comments

Comments
 (0)