Skip to content

Commit a535f5c

Browse files
committed
Sort messages and message handlers
1 parent e708588 commit a535f5c

24 files changed

Lines changed: 790 additions & 737 deletions

Cargo.lock

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ spin = "0.9.2"
2323
kurbo = { git = "https://github.com/GraphiteEditor/kurbo.git", features = [
2424
"serde",
2525
] }
26+
remain = "0.2.2"
2627

2728
[dependencies.graphene]
2829
path = "../graphene"

editor/src/document/artboard_message_handler.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ use graphene::Operation as DocumentOperation;
1010
use serde::{Deserialize, Serialize};
1111
use std::collections::VecDeque;
1212

13+
#[remain::sorted]
1314
#[impl_message(Message, DocumentMessage, Artboard)]
1415
#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
1516
pub enum ArtboardMessage {
16-
DispatchOperation(Box<DocumentOperation>),
1717
AddArtboard { top: f64, left: f64, height: f64, width: f64 },
18+
DispatchOperation(Box<DocumentOperation>),
1819
RenderArtboards,
1920
}
2021

@@ -37,14 +38,12 @@ impl ArtboardMessageHandler {
3738
}
3839

3940
impl MessageHandler<ArtboardMessage, (&mut LayerMetadata, &GrapheneDocument, &InputPreprocessor)> for ArtboardMessageHandler {
41+
#[remain::check]
4042
fn process_action(&mut self, message: ArtboardMessage, _data: (&mut LayerMetadata, &GrapheneDocument, &InputPreprocessor), responses: &mut VecDeque<Message>) {
4143
// let (layer_metadata, document, ipp) = data;
4244
use ArtboardMessage::*;
45+
#[remain::sorted]
4346
match message {
44-
DispatchOperation(operation) => match self.artboards_graphene_document.handle_operation(&operation) {
45-
Ok(_) => (),
46-
Err(e) => log::error!("Artboard Error: {:?}", e),
47-
},
4847
AddArtboard { top, left, height, width } => {
4948
let artboard_id = generate_uuid();
5049
self.artboard_ids.push(artboard_id);
@@ -64,6 +63,10 @@ impl MessageHandler<ArtboardMessage, (&mut LayerMetadata, &GrapheneDocument, &In
6463

6564
responses.push_back(DocumentMessage::RenderDocument.into());
6665
}
66+
DispatchOperation(operation) => match self.artboards_graphene_document.handle_operation(&operation) {
67+
Ok(_) => (),
68+
Err(e) => log::error!("Artboard Error: {:?}", e),
69+
},
6770
RenderArtboards => {
6871
// Render an infinite canvas if there are no artboards
6972
if self.artboard_ids.is_empty() {

0 commit comments

Comments
 (0)