@@ -21,7 +21,7 @@ const GROUP_MESSAGES: &[MessageDiscriminant] = &[
21
21
MessageDiscriminant :: Documents ( DocumentsMessageDiscriminant :: Document ( DocumentMessageDiscriminant :: RenderDocument ) ) ,
22
22
MessageDiscriminant :: Documents ( DocumentsMessageDiscriminant :: Document ( DocumentMessageDiscriminant :: FolderChanged ) ) ,
23
23
MessageDiscriminant :: Frontend ( FrontendMessageDiscriminant :: UpdateLayer ) ,
24
- MessageDiscriminant :: Frontend ( FrontendMessageDiscriminant :: ExpandFolder ) ,
24
+ MessageDiscriminant :: Frontend ( FrontendMessageDiscriminant :: DisplayFolderTreeStructure ) ,
25
25
MessageDiscriminant :: Tool ( ToolMessageDiscriminant :: SelectedLayersChanged ) ,
26
26
] ;
27
27
@@ -124,10 +124,10 @@ mod test {
124
124
init_logger ( ) ;
125
125
let mut editor = create_editor_with_three_layers ( ) ;
126
126
127
- let document_before_copy = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
127
+ let document_before_copy = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
128
128
editor. handle_message ( DocumentsMessage :: Copy ) ;
129
129
editor. handle_message ( DocumentsMessage :: PasteIntoFolder { path : vec ! [ ] , insert_index : -1 } ) ;
130
- let document_after_copy = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
130
+ let document_after_copy = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
131
131
132
132
let layers_before_copy = document_before_copy. root . as_folder ( ) . unwrap ( ) . layers ( ) ;
133
133
let layers_after_copy = document_after_copy. root . as_folder ( ) . unwrap ( ) . layers ( ) ;
@@ -154,14 +154,14 @@ mod test {
154
154
init_logger ( ) ;
155
155
let mut editor = create_editor_with_three_layers ( ) ;
156
156
157
- let document_before_copy = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
157
+ let document_before_copy = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
158
158
let shape_id = document_before_copy. root . as_folder ( ) . unwrap ( ) . layer_ids [ 1 ] ;
159
159
160
160
editor. handle_message ( DocumentMessage :: SetSelectedLayers ( vec ! [ vec![ shape_id] ] ) ) ;
161
161
editor. handle_message ( DocumentsMessage :: Copy ) ;
162
162
editor. handle_message ( DocumentsMessage :: PasteIntoFolder { path : vec ! [ ] , insert_index : -1 } ) ;
163
163
164
- let document_after_copy = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
164
+ let document_after_copy = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
165
165
166
166
let layers_before_copy = document_before_copy. root . as_folder ( ) . unwrap ( ) . layers ( ) ;
167
167
let layers_after_copy = document_after_copy. root . as_folder ( ) . unwrap ( ) . layers ( ) ;
@@ -193,7 +193,7 @@ mod test {
193
193
194
194
editor. handle_message ( DocumentMessage :: CreateFolder ( vec ! [ ] ) ) ;
195
195
196
- let document_before_added_shapes = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
196
+ let document_before_added_shapes = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
197
197
let folder_id = document_before_added_shapes. root . as_folder ( ) . unwrap ( ) . layer_ids [ FOLDER_INDEX ] ;
198
198
199
199
// TODO: This adding of a Line and Pen should be rewritten using the corresponding functions in EditorTestUtils.
@@ -215,14 +215,14 @@ mod test {
215
215
216
216
editor. handle_message ( DocumentMessage :: SetSelectedLayers ( vec ! [ vec![ folder_id] ] ) ) ;
217
217
218
- let document_before_copy = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
218
+ let document_before_copy = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
219
219
220
220
editor. handle_message ( DocumentsMessage :: Copy ) ;
221
221
editor. handle_message ( DocumentMessage :: DeleteSelectedLayers ) ;
222
222
editor. handle_message ( DocumentsMessage :: PasteIntoFolder { path : vec ! [ ] , insert_index : -1 } ) ;
223
223
editor. handle_message ( DocumentsMessage :: PasteIntoFolder { path : vec ! [ ] , insert_index : -1 } ) ;
224
224
225
- let document_after_copy = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
225
+ let document_after_copy = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
226
226
227
227
let layers_before_copy = document_before_copy. root . as_folder ( ) . unwrap ( ) . layers ( ) ;
228
228
let layers_after_copy = document_after_copy. root . as_folder ( ) . unwrap ( ) . layers ( ) ;
@@ -273,7 +273,7 @@ mod test {
273
273
const SHAPE_INDEX : usize = 1 ;
274
274
const RECT_INDEX : usize = 0 ;
275
275
276
- let document_before_copy = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
276
+ let document_before_copy = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
277
277
let rect_id = document_before_copy. root . as_folder ( ) . unwrap ( ) . layer_ids [ RECT_INDEX ] ;
278
278
let ellipse_id = document_before_copy. root . as_folder ( ) . unwrap ( ) . layer_ids [ ELLIPSE_INDEX ] ;
279
279
@@ -284,7 +284,7 @@ mod test {
284
284
editor. handle_message ( DocumentsMessage :: PasteIntoFolder { path : vec ! [ ] , insert_index : -1 } ) ;
285
285
editor. handle_message ( DocumentsMessage :: PasteIntoFolder { path : vec ! [ ] , insert_index : -1 } ) ;
286
286
287
- let document_after_copy = editor. dispatcher . documents_message_handler . active_document ( ) . document . clone ( ) ;
287
+ let document_after_copy = editor. dispatcher . documents_message_handler . active_document ( ) . graphene_document . clone ( ) ;
288
288
289
289
let layers_before_copy = document_before_copy. root . as_folder ( ) . unwrap ( ) . layers ( ) ;
290
290
let layers_after_copy = document_after_copy. root . as_folder ( ) . unwrap ( ) . layers ( ) ;
0 commit comments