Merge branch 'master' into Clear-Artboards

Author: moosama76

.github/workflows/comment-clippy-warnings.yaml

@@ -9,7 +9,8 @@ jobs:
   clippy:
     name: Run Clippy
     runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.draft }}
+    # TODO(Keavon): Find a workaround (passing the output text to a separate action with permission to read the secrets?) that allows this to work on fork PRs
+    if: ${{ !github.event.pull_request.draft && !github.event.pull_request.head.repo.fork }}
     permissions:
       contents: read
       pull-requests: write

.github/workflows/website.yml

@@ -40,7 +40,7 @@ jobs:
       - name: 🌐 Build Graphite website with Zola
         run: |
           cd website
-          zola build
+          zola --config config_prod.toml build
 
       - name: 🔍 Check if `website/other` directory changed
         uses: dorny/paths-filter@v3

Cargo.toml

@@ -63,7 +63,7 @@ spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git" }
 wgpu-types = "23"
 wgpu = "23"
 once_cell = "1.13" # Remove when `core::cell::LazyCell` (<https://doc.rust-lang.org/core/cell/struct.LazyCell.html>) is stabilized in Rust 1.80 and we bump our MSRV
-wasm-bindgen = "=0.2.99" # NOTICE: ensure this stays in sync with the `wasm-bindgen-cli` version in `website/content/volunteer/guide/getting-started/_index.md`. We pin this version because wasm-bindgen upgrades may break various things.
+wasm-bindgen = "=0.2.99" # NOTICE: ensure this stays in sync with the `wasm-bindgen-cli` version in `website/content/volunteer/guide/project-setup/_index.md`. We pin this version because wasm-bindgen upgrades may break various things.
 wasm-bindgen-futures = "0.4"
 js-sys = "=0.3.76"
 web-sys = "=0.3.76"

editor/src/dispatcher.rs

@@ -77,7 +77,7 @@ impl Dispatcher {
 
 	pub fn handle_message<T: Into<Message>>(&mut self, message: T, process_after_all_current: bool) {
 		let message = message.into();
-		// Add all aditional messages to the buffer if it exists (except from the end buffer message)
+		// Add all additional messages to the buffer if it exists (except from the end buffer message)
 		if !matches!(message, Message::EndBuffer(_)) {
 			if let Some(buffered_queue) = &mut self.buffered_queue {
 				Self::schedule_execution(buffered_queue, true, [message]);

editor/src/messages/frontend/frontend_message.rs

@@ -110,7 +110,7 @@ pub enum FrontendMessage {
 		#[serde(rename = "copyText")]
 		copy_text: String,
 	},
-	// TODO: Eventually remove this (probably starting late 2024)
+	// TODO: Eventually remove this document upgrade code
 	TriggerUpgradeDocumentToVectorManipulationFormat {
 		#[serde(rename = "documentId")]
 		document_id: DocumentId,
@@ -234,7 +234,7 @@ pub enum FrontendMessage {
 		#[serde(rename = "hintData")]
 		hint_data: HintData,
 	},
-	UpdateLayersPanelOptionsLayout {
+	UpdateLayersPanelControlBarLayout {
 		#[serde(rename = "layoutTarget")]
 		layout_target: LayoutTarget,
 		diff: Vec<WidgetDiff>,
@@ -251,7 +251,7 @@ pub enum FrontendMessage {
 		nodes: Vec<FrontendNode>,
 		wires: Vec<FrontendNodeWire>,
 	},
-	UpdateNodeGraphBarLayout {
+	UpdateNodeGraphControlBarLayout {
 		#[serde(rename = "layoutTarget")]
 		layout_target: LayoutTarget,
 		diff: Vec<WidgetDiff>,

editor/src/messages/layout/layout_message_handler.rs

@@ -401,9 +401,9 @@ impl LayoutMessageHandler {
 			LayoutTarget::DialogColumn2 => FrontendMessage::UpdateDialogColumn2 { layout_target, diff },
 			LayoutTarget::DocumentBar => FrontendMessage::UpdateDocumentBarLayout { layout_target, diff },
 			LayoutTarget::DocumentMode => FrontendMessage::UpdateDocumentModeLayout { layout_target, diff },
-			LayoutTarget::LayersPanelOptions => FrontendMessage::UpdateLayersPanelOptionsLayout { layout_target, diff },
+			LayoutTarget::LayersPanelControlBar => FrontendMessage::UpdateLayersPanelControlBarLayout { layout_target, diff },
 			LayoutTarget::MenuBar => unreachable!("Menu bar is not diffed"),
-			LayoutTarget::NodeGraphBar => FrontendMessage::UpdateNodeGraphBarLayout { layout_target, diff },
+			LayoutTarget::NodeGraphControlBar => FrontendMessage::UpdateNodeGraphControlBarLayout { layout_target, diff },
 			LayoutTarget::PropertiesSections => FrontendMessage::UpdatePropertyPanelSectionsLayout { layout_target, diff },
 			LayoutTarget::ToolOptions => FrontendMessage::UpdateToolOptionsLayout { layout_target, diff },
 			LayoutTarget::ToolShelf => FrontendMessage::UpdateToolShelfLayout { layout_target, diff },

editor/src/messages/layout/utility_types/layout_widget.rs

@@ -33,11 +33,11 @@ pub enum LayoutTarget {
 	/// Contains the dropdown for design / select / guide mode found on the top left of the canvas.
 	DocumentMode,
 	/// Options for opacity seen at the top of the Layers panel.
-	LayersPanelOptions,
+	LayersPanelControlBar,
 	/// The dropdown menu at the very top of the application: File, Edit, etc.
 	MenuBar,
 	/// Bar at the top of the node graph containing the location and the "Preview" and "Hide" buttons.
-	NodeGraphBar,
+	NodeGraphControlBar,
 	/// The body of the Properties panel containing many collapsable sections.
 	PropertiesSections,
 	/// The bar directly above the canvas, left-aligned and to the right of the document mode dropdown.

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -275,10 +275,10 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 				let data_buffer: RawBuffer = Self::default().serialize_root();
 				responses.add(FrontendMessage::UpdateDocumentLayerStructure { data_buffer });
 
-				// Clear the options bar
+				// Clear the control bar
 				responses.add(LayoutMessage::SendLayout {
 					layout: Layout::WidgetLayout(Default::default()),
-					layout_target: LayoutTarget::LayersPanelOptions,
+					layout_target: LayoutTarget::LayersPanelControlBar,
 				});
 			}
 			DocumentMessage::InsertBooleanOperation { operation } => {
@@ -350,7 +350,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 			DocumentMessage::DocumentHistoryBackward => self.undo_with_history(ipp, responses),
 			DocumentMessage::DocumentHistoryForward => self.redo_with_history(ipp, responses),
 			DocumentMessage::DocumentStructureChanged => {
-				self.update_layers_panel_options_bar_widgets(responses);
+				self.update_layers_panel_control_bar_widgets(responses);
 
 				self.network_interface.load_structure();
 				let data_buffer: RawBuffer = self.serialize_root();
@@ -1903,7 +1903,7 @@ impl DocumentMessageHandler {
 		});
 	}
 
-	pub fn update_layers_panel_options_bar_widgets(&self, responses: &mut VecDeque<Message>) {
+	pub fn update_layers_panel_control_bar_widgets(&self, responses: &mut VecDeque<Message>) {
 		// Get an iterator over the selected layers (excluding artboards which don't have an opacity or blend mode).
 		let selected_nodes = self.network_interface.selected_nodes(&[]).unwrap();
 		let selected_layers_except_artboards = selected_nodes.selected_layers_except_artboards(&self.network_interface);
@@ -1971,7 +1971,7 @@ impl DocumentMessageHandler {
 			.selected_layers(self.metadata())
 			.all(|layer| self.network_interface.is_locked(&layer.to_node(), &[]));
 
-		let layers_panel_options_bar = WidgetLayout::new(vec![LayoutGroup::Row {
+		let layers_panel_control_bar = WidgetLayout::new(vec![LayoutGroup::Row {
 			widgets: vec![
 				DropdownInput::new(blend_mode_menu_entries)
 					.selected_index(blend_mode.and_then(|blend_mode| blend_mode.index_in_list_svg_subset()).map(|index| index as u32))
@@ -2039,8 +2039,8 @@ impl DocumentMessageHandler {
 		}]);
 
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(layers_panel_options_bar),
-			layout_target: LayoutTarget::LayersPanelOptions,
+			layout: Layout::WidgetLayout(layers_panel_control_bar),
+			layout_target: LayoutTarget::LayersPanelControlBar,
 		});
 	}
 
@@ -2297,7 +2297,7 @@ impl Iterator for ClickXRayIter<'_> {
 	}
 }
 
-// TODO: Eventually remove this (probably starting late 2024)
+// TODO: Eventually remove this document upgrade code
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct OldDocumentMessageHandler {
 	// ============================================

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

@@ -1642,11 +1642,11 @@ impl NodeGraphMessageHandler {
 		common
 	}
 
-	/// Send the cached layout to the frontend for the options bar at the top of the node panel
+	/// Send the cached layout to the frontend for the control bar at the top of the node panel
 	fn send_node_bar_layout(&self, responses: &mut VecDeque<Message>) {
 		responses.add(LayoutMessage::SendLayout {
 			layout: Layout::WidgetLayout(WidgetLayout::new(self.widgets.to_vec())),
-			layout_target: LayoutTarget::NodeGraphBar,
+			layout_target: LayoutTarget::NodeGraphControlBar,
 		});
 	}
 

editor/src/messages/portfolio/document/overlays/grid_overlays.rs

@@ -183,7 +183,8 @@ fn grid_overlay_isometric_dot(document: &DocumentMessageHandler, overlay_context
 			document_to_viewport.transform_point2(start),
 			document_to_viewport.transform_point2(end),
 			Some(&("#".to_string() + &grid_color.rgba_hex())),
-			Some((spacing_x / cos_a) * document_to_viewport.matrix2.x_axis.length()),
+			Some(1.),
+			Some((spacing_x / cos_a) * document_to_viewport.matrix2.x_axis.length() - 1.),
 			None,
 		);
 	}