Merge branch 'master' into 82-path-tool

Author: Keavon

.deployment/cd.sh

@@ -20,4 +20,5 @@ echo 📦 Install cargo-about
 cargo install cargo-about
 
 echo 👷 Build Graphite web client
+export NODE_ENV=production
 npm run build

.github/workflows/ci.yml

@@ -23,28 +23,42 @@ jobs:
         node-version: '16.x'
 
     - name: 🚧 Install Node dependencies
-      run: cd frontend && npm ci
+      run: |
+        cd frontend
+        npm ci
 
     - name: 🔼 Update Rust to latest stable
-      run: rustc --version && rustup update stable && rustc --version
-
-    - name: 📦 Install cargo-about
-      run: cargo install cargo-about
+      run: |
+        rustc --version
+        rustup update stable
+        rustc --version
 
     - name: 🌐 Build Graphite web code
-      run: cd frontend && npm run build
+      env:
+        NODE_ENV: production
+        SKIP_CARGO_ABOUT: true
+      run: |
+        cd frontend
+        npm run build
 
     - name: 👕 Lint Graphite web formatting
-      run: export NODE_ENV=production && cd frontend && npm run lint
+      env:
+        NODE_ENV: production
+      run: |
+        cd frontend
+        npm run lint
 
     - name: 🔬 Check Rust formatting
-      run: cargo fmt --all -- --check
+      run: |
+        cargo fmt --all -- --check
 
     - name: 🦀 Build Rust code
-      run: cargo build --verbose
+      run: |
+        cargo build --verbose
 
     - name: 🧪 Run Rust tests
-      run: cargo test --verbose
+      run: |
+        cargo test --verbose
 
   cargo-deny:
     runs-on: ubuntu-latest

Cargo.lock

@@ -1,6 +1,7 @@
 [package]
 name = "graphite-charcoal"
-version = "0.1.0"
+publish = false
+version = "0.0.0"
 rust-version = "1.56.0"
 authors = ["Graphite Authors <[email protected]>"]
 edition = "2021"

charcoal/Cargo.toml

@@ -2,4 +2,4 @@
 
 ## Mask mode
 
-At any time while in the viewport, <kbd>Tab</kbd> may be pressed to enter mask mode. The underlying canvas seen before entering this mode is still shown, but masks are drawn as marching ants (or other optional overlays) above the main document content. While in this mode, an island layer group is provided as the destination for drawing new mask layers using the regular set of tools. The Layer Panel also still shows the underlying main document, which lets the user select layers as contextual inputs for tools that are aware of input layers, like the Fill Tool. Rather than showing the full-color shapes over the main document canvas, they are overlaid in wireframe view mode and surrounded by a marching ants marquee outline. The mask group may be isolated (meaning it becomes the render output to the viewport, and a breadcrumb trail is shown leading from the document to the isolated layer/group) which makes the viewport output show the mask in grayscale and has the Layer Panel host the contents of the mask group. While in mask mode, the working colors are temporarily replaced with a grayscale pair. Certain tools, such as the Freehand Tool and Pen Tool, may default to a "closed" form in mask mode by turning off stroke and setting fill to white in order to provide functionality akin to the lasso or polygonal lasso selection tools. <kbd>Tab</kbd> may be hit again to exit mask mode, but the marching ants still show up. However now, all tools used and commands performed will take into account the working mask. <kbd>Ctrl</kbd><kbd>D</kbd> will discard the working mask.
+At any time while in the viewport, <kbd>Tab</kbd> may be pressed to enter mask mode. The underlying canvas seen before entering this mode is still shown, but masks are drawn as marching ants (or other optional overlays) above the main document content. While in this mode, an island layer group is provided as the destination for drawing new mask layers using the regular set of tools. The Layer Panel also still shows the underlying main document, which lets the user select layers as contextual inputs for tools that are aware of input layers, like the Fill Tool. Rather than showing the full-color shapes over the main document canvas, they are overlaid in outline view mode and surrounded by a marching ants marquee outline. The mask group may be isolated (meaning it becomes the render output to the viewport, and a breadcrumb trail is shown leading from the document to the isolated layer/group) which makes the viewport output show the mask in grayscale and has the Layer Panel host the contents of the mask group. While in mask mode, the working colors are temporarily replaced with a grayscale pair. Certain tools, such as the Freehand Tool and Pen Tool, may default to a "closed" form in mask mode by turning off stroke and setting fill to white in order to provide functionality akin to the lasso or polygonal lasso selection tools. <kbd>Tab</kbd> may be hit again to exit mask mode, but the marching ants still show up. However now, all tools used and commands performed will take into account the working mask. <kbd>Ctrl</kbd><kbd>D</kbd> will discard the working mask.

docs/editor/6-masking.md

@@ -1,6 +1,7 @@
 [package]
 name = "graphite-editor"
-version = "0.1.0"
+publish = false
+version = "0.0.0"
 rust-version = "1.56.0"
 authors = ["Graphite Authors <[email protected]>"]
 edition = "2021"

editor/Cargo.toml

@@ -17,11 +17,15 @@ pub struct Dispatcher {
 	pub responses: Vec<FrontendMessage>,
 }
 
-const GROUP_MESSAGES: &[MessageDiscriminant] = &[
+// For optimization, these are messages guaranteed to be redundant when repeated
+// The last occurrence of the message in the message queue is sufficient to ensure correctness
+// In addition, these messages do not change any state in the backend (aside from caches)
+const SIDE_EFFECT_FREE_MESSAGES: &[MessageDiscriminant] = &[
 	MessageDiscriminant::Documents(DocumentsMessageDiscriminant::Document(DocumentMessageDiscriminant::RenderDocument)),
 	MessageDiscriminant::Documents(DocumentsMessageDiscriminant::Document(DocumentMessageDiscriminant::FolderChanged)),
 	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::UpdateLayer),
 	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::DisplayFolderTreeStructure),
+	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::UpdateOpenDocumentsList),
 	MessageDiscriminant::Tool(ToolMessageDiscriminant::SelectedLayersChanged),
 ];
 
@@ -31,10 +35,11 @@ impl Dispatcher {
 
 		use Message::*;
 		while let Some(message) = self.messages.pop_front() {
-			if GROUP_MESSAGES.contains(&message.to_discriminant()) && self.messages.contains(&message) {
+			// Skip processing of this message if it will be processed later
+			if SIDE_EFFECT_FREE_MESSAGES.contains(&message.to_discriminant()) && self.messages.contains(&message) {
 				continue;
 			}
-			log_message(&message);
+			self.log_message(&message);
 			match message {
 				NoOp => (),
 				Documents(message) => self.documents_message_handler.process_action(message, &self.input_preprocessor, &mut self.messages),
@@ -74,18 +79,18 @@ impl Dispatcher {
 			responses: vec![],
 		}
 	}
-}
 
-fn log_message(message: &Message) {
-	use Message::*;
-	if log::max_level() == log::LevelFilter::Trace
-		&& !(matches!(
-			message,
-			InputPreprocessor(_) | Frontend(FrontendMessage::SetCanvasZoom { .. }) | Frontend(FrontendMessage::SetCanvasRotation { .. })
-		) || MessageDiscriminant::from(message).local_name().ends_with("MouseMove"))
-	{
-		log::trace!("Message: {:?}", message);
-		//log::trace!("Hints:{:?}", self.input_mapper.hints(self.collect_actions()));
+	fn log_message(&self, message: &Message) {
+		use Message::*;
+		if log::max_level() == log::LevelFilter::Trace
+			&& !(matches!(
+				message,
+				InputPreprocessor(_) | Frontend(FrontendMessage::SetCanvasZoom { .. }) | Frontend(FrontendMessage::SetCanvasRotation { .. })
+			) || MessageDiscriminant::from(message).local_name().ends_with("MouseMove"))
+		{
+			log::trace!("Message: {:?}", message);
+			// log::trace!("Hints: {:?}", self.input_mapper.hints(self.collect_actions()));
+		}
 	}
 }
 
@@ -191,7 +196,7 @@ mod test {
 		const LINE_INDEX: usize = 0;
 		const PEN_INDEX: usize = 1;
 
-		editor.handle_message(DocumentMessage::CreateFolder(vec![]));
+		editor.handle_message(DocumentMessage::CreateEmptyFolder(vec![]));
 
 		let document_before_added_shapes = editor.dispatcher.documents_message_handler.active_document().graphene_document.clone();
 		let folder_id = document_before_added_shapes.root.as_folder().unwrap().layer_ids[FOLDER_INDEX];