@@ -10,11 +10,12 @@ import CoreUtil
1010final class PDFGeneratorViewController : ToolPageViewController {
1111 private let cell = PDFGeneratorView ( )
1212
13- @Observable var images = [ ImageItem] ( )
13+ @RestorableData ( " pdf.input " ) var images = [ ImageItem] ( )
1414
1515 override func loadView( ) { self . view = cell }
1616
1717 override func viewDidLoad( ) {
18+ print ( _images. fileURL)
1819 self . $images
1920 . sink { [ unowned self] in cell. imageListView. imageItems = $0 } . store ( in: & objectBag)
2021
@@ -25,11 +26,35 @@ final class PDFGeneratorViewController: ToolPageViewController {
2526 self . cell. imageListView. removePublisher
2627 . sink { [ unowned self] in $0. reversed ( ) . forEach { self . images. remove ( at: $0) } } . store ( in: & objectBag)
2728 self . cell. imageListView. movePublisher
28- . sink { [ unowned self] in self . images . move ( fromIndex : $0 . from , toIndex : $0 . to ) } . store ( in: & objectBag)
29+ . sink { [ unowned self] in self . moveItems ( $0 , to : $1 ) } . store ( in: & objectBag)
2930 self . cell. clearButton. actionPublisher
3031 . sink { [ unowned self] in self . images = [ ] } . store ( in: & objectBag)
3132 }
3233
34+ private func moveItems( _ fromRows: [ Int ] , to row: Int ) {
35+ guard !fromRows. isEmpty else { return }
36+
37+ let fromMin = fromRows. min ( ) !
38+
39+ let fromRows = fromRows. sorted ( ) . reversed ( )
40+ var nextImages = self . images
41+ var removed = [ ImageItem] ( )
42+
43+ for fromRow in fromRows {
44+ let item = nextImages. remove ( at: fromRow)
45+ removed. append ( item)
46+ }
47+
48+ removed. reverse ( )
49+
50+ if row < fromMin {
51+ nextImages. insert ( contentsOf: removed, at: row)
52+ } else {
53+ nextImages. insert ( contentsOf: removed, at: row - fromRows. count)
54+ }
55+ self . images = nextImages
56+ }
57+
3358 private func readURLs( _ pasteboard: NSPasteboard ) {
3459 var newImageItems = [ ImageItem] ( )
3560
@@ -103,7 +128,7 @@ private enum ScaleMode: String, TextItem {
103128 var title : String { rawValue }
104129}
105130
106- final private class PDFGeneratorView : ToolPage {
131+ final private class PDFGeneratorView : Page {
107132 let imageListView = ImageListView ( )
108133 let clearButton = SectionButton ( title: " Clear " , image: R . Image. clear)
109134 let generateButton = Button ( title: " Generate PDF " )
@@ -142,16 +167,22 @@ final private class PDFGeneratorView: ToolPage {
142167 }
143168}
144169
145- struct ImageItem {
170+ struct ImageItem : Codable {
146171 let title : String
147- let image : NSImage
172+ var image : NSImage { imageContainer. image }
173+ private let imageContainer : NSImageContainer
174+
175+ init ( title: String , image: NSImage ) {
176+ self . title = title
177+ self . imageContainer = . wrap( image)
178+ }
148179}
149180
150181final private class ImageListView : NSLoadScrollView {
151182 let listView = NSTableView . list ( )
152183 var imageItems = [ ImageItem] ( ) { didSet { listView. reloadData ( ) } }
153184 var removePublisher = PassthroughSubject < [ Int ] , Never > ( )
154- var movePublisher = PassthroughSubject < ( from: Int , to: Int ) , Never > ( )
185+ var movePublisher = PassthroughSubject < ( from: [ Int ] , to: Int ) , Never > ( )
155186 private let backgroundLayer = ControlBackgroundLayer . animationDisabled ( )
156187
157188 override func keyDown( with event: NSEvent ) {
@@ -254,7 +285,7 @@ extension ImageListView: NSTableViewDelegate, NSTableViewDataSource {
254285
255286 func tableView( _ tableView: NSTableView , acceptDrop info: NSDraggingInfo , row: Int , dropOperation: NSTableView . DropOperation ) -> Bool {
256287 guard dropOperation == . above else { return false }
257- guard let fromRow = info. draggingPasteboard. propertyList ( forType: . imageItem) as? Int else { return false }
288+ guard let fromRow = info. draggingPasteboard. pasteboardItems ? . map { $0 . propertyList ( forType: . imageItem) } as? [ Int ] else { return false }
258289
259290 movePublisher. send ( ( fromRow, row) )
260291
0 commit comments