Renamed BooleanOperation::Difference to BooleanOperation::Exclude

Author: devviktoria

editor/src/messages/menu_bar/menu_bar_message_handler.rs

@@ -486,11 +486,11 @@ impl LayoutHolder for MenuBarMessageHandler {
 										DocumentMessage::GroupSelectedLayers { group_folder_type }.into()
 									})
 									.disabled(no_active_document || !has_selected_layers),
-								MenuListEntry::new("Difference")
-									.label("Difference")
-									.icon("BooleanDifference")
+								MenuListEntry::new("Exclude")
+									.label("Exclude")
+									.icon("BooleanExclude")
 									.on_commit(|_| {
-										let group_folder_type = GroupFolderType::BooleanOperation(BooleanOperation::Difference);
+										let group_folder_type = GroupFolderType::BooleanOperation(BooleanOperation::Exclude);
 										DocumentMessage::GroupSelectedLayers { group_folder_type }.into()
 									})
 									.disabled(no_active_document || !has_selected_layers),

frontend/src/icons.ts

@@ -110,7 +110,7 @@ import AlignRight from "/../branding/assets/icon-16px-solid/align-right.svg";
 import AlignTop from "/../branding/assets/icon-16px-solid/align-top.svg";
 import AlignVerticalCenter from "/../branding/assets/icon-16px-solid/align-vertical-center.svg";
 import Artboard from "/../branding/assets/icon-16px-solid/artboard.svg";
-import BooleanDifference from "/../branding/assets/icon-16px-solid/boolean-difference.svg";
+import BooleanExclude from "/../branding/assets/icon-16px-solid/boolean-difference.svg";
 import BooleanDivide from "/../branding/assets/icon-16px-solid/boolean-divide.svg";
 import BooleanIntersect from "/../branding/assets/icon-16px-solid/boolean-intersect.svg";
 import BooleanSubtractBack from "/../branding/assets/icon-16px-solid/boolean-subtract-back.svg";
@@ -249,7 +249,7 @@ const SOLID_16PX = {
 	AlignTop: { svg: AlignTop, size: 16 },
 	AlignVerticalCenter: { svg: AlignVerticalCenter, size: 16 },
 	Artboard: { svg: Artboard, size: 16 },
-	BooleanDifference: { svg: BooleanDifference, size: 16 },
+	BooleanExclude: { svg: BooleanExclude, size: 16 },
 	BooleanDivide: { svg: BooleanDivide, size: 16 },
 	BooleanIntersect: { svg: BooleanIntersect, size: 16 },
 	BooleanSubtractBack: { svg: BooleanSubtractBack, size: 16 },

node-graph/libraries/vector-types/src/vector/misc.rs

@@ -21,8 +21,8 @@ pub enum BooleanOperation {
 	SubtractBack,
 	#[icon("BooleanIntersect")]
 	Intersect,
-	#[icon("BooleanDifference")]
-	Difference,
+	#[icon("BooleanExclude")]
+	Exclude,
 	#[icon("BooleanSubtractFront")]
 	Trim,
 	#[icon("BooleanSubtractFront")]

node-graph/nodes/path-bool/src/lib.rs

@@ -36,7 +36,7 @@ async fn boolean_operation<I: graphic_types::IntoGraphicList + 'n + Send + Clone
 	let flattened = flatten_vector(&content);
 
 	let mut result_vector_list = match operation {
-		BooleanOperation::Union | BooleanOperation::SubtractFront | BooleanOperation::SubtractBack | BooleanOperation::Intersect | BooleanOperation::Difference => {
+		BooleanOperation::Union | BooleanOperation::SubtractFront | BooleanOperation::SubtractBack | BooleanOperation::Intersect | BooleanOperation::Exclude => {
 			boolean_operation_on_vector_list(&flattened, operation)
 		}
 		BooleanOperation::Trim | BooleanOperation::Crop => cascading_subtract(&flattened, operation),
@@ -112,7 +112,7 @@ impl WindingNumber {
 			BooleanOperation::SubtractFront => self.elems.first().is_some_and(is_in) && self.elems.iter().skip(1).all(is_out),
 			BooleanOperation::SubtractBack => self.elems.last().is_some_and(is_in) && self.elems.iter().rev().skip(1).all(is_out),
 			BooleanOperation::Intersect => !self.elems.is_empty() && self.elems.iter().all(is_in),
-			BooleanOperation::Difference => self.elems.iter().any(is_in) && !self.elems.iter().all(is_in),
+			BooleanOperation::Exclude => self.elems.iter().any(is_in) && !self.elems.iter().all(is_in),
 			BooleanOperation::Trim => unreachable!(),
 			BooleanOperation::Crop => unreachable!(),
 		}