update

Author: mTvare6

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

@@ -1,7 +1,6 @@
 use super::utility_functions::overlay_canvas_context;
 use crate::consts::{
-	COLOR_OVERLAY_BLUE, COLOR_OVERLAY_GREEN, COLOR_OVERLAY_RED, COLOR_OVERLAY_WHITE, COLOR_OVERLAY_YELLOW, COMPASS_ROSE_ARROW_SIZE, COMPASS_ROSE_HOVER_RING_DIAMETER, COMPASS_ROSE_MAIN_RING_DIAMETER,
-	COMPASS_ROSE_RING_INNER_DIAMETER, DOWEL_PIN_RADIUS, MANIPULATOR_GROUP_MARKER_SIZE, PIVOT_CROSSHAIR_LENGTH, PIVOT_CROSSHAIR_THICKNESS, PIVOT_DIAMETER,
+	COLOR_OVERLAY_BLUE, COLOR_OVERLAY_GREEN, COLOR_OVERLAY_RED, COLOR_OVERLAY_WHITE, COLOR_OVERLAY_YELLOW, COMPASS_ROSE_ARROW_SIZE, COMPASS_ROSE_HOVER_RING_DIAMETER, COMPASS_ROSE_MAIN_RING_DIAMETER, COMPASS_ROSE_RING_INNER_DIAMETER, DOWEL_PIN_RADIUS, MANIPULATOR_GROUP_MARKER_SIZE, PIVOT_CROSSHAIR_LENGTH, PIVOT_CROSSHAIR_THICKNESS, PIVOT_DIAMETER
 };
 use crate::messages::prelude::Message;
 use bezier_rs::{Bezier, Subpath};
@@ -567,7 +566,7 @@ impl OverlayContext {
 		self.render_context.arc(x, y, DOWEL_PIN_RADIUS, 0., TAU).expect("Failed to draw the circle");
 		self.render_context.set_fill_style_str(COLOR_OVERLAY_WHITE);
 		self.render_context.fill();
-		self.render_context.set_stroke_style_str(COLOR_OVERLAY_BLUE);
+		self.render_context.set_stroke_style_str(COLOR_OVERLAY_YELLOW);
 		self.render_context.stroke();
 
 		// Draw the two blue filled sectors
@@ -580,7 +579,7 @@ impl OverlayContext {
 		self.render_context.move_to(x, y);
 		self.render_context.arc(x, y, DOWEL_PIN_RADIUS, PI + FRAC_PI_2, TAU).expect("Failed to draw arc");
 		self.render_context.close_path();
-		self.render_context.set_fill_style_str(COLOR_OVERLAY_BLUE);
+		self.render_context.set_fill_style_str(COLOR_OVERLAY_YELLOW);
 		self.render_context.fill();
 
 		self.end_dpi_aware_transform();

editor/src/messages/tool/tool_messages/select_tool.rs

@@ -95,6 +95,7 @@ pub struct DotState {
 	enabled: bool,
 	dot: DotType,
 }
+
 impl Default for DotState {
 	fn default() -> Self {
 		Self {
@@ -113,7 +114,7 @@ impl DotType {
 impl fmt::Display for DotType {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		match self {
-			DotType::Pivot => write!(f, "Working Pivot"),
+			DotType::Pivot => write!(f, "Draft Pivot"),
 			DotType::Average => write!(f, "Average of Origins"),
 		}
 	}
@@ -215,7 +216,7 @@ impl SelectTool {
 				.tooltip("Disable Transform Pivot Point")
 				.on_update(|optional_input: &CheckboxInput| SelectToolMessage::SelectOptions(SelectOptionsUpdate::ToggleDotType(optional_input.checked)).into())
 				.widget_holder(),
-			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			Separator::new(SeparatorType::Related).widget_holder(),
 			DropdownInput::new(vec![dot_type_entries])
 				.selected_index(Some(match self.tool_data.dot_state.dot {
 					DotType::Pivot => 0,
@@ -839,7 +840,7 @@ impl Fsm for SelectToolFsmState {
 						.flatten()
 				});
 
-				if overlay_context.visibility_settings.origin() {
+				if overlay_context.visibility_settings.origin() && !tool_data.dot_state.dot.is_pivot() {
 					for layer in document.network_interface.selected_nodes().selected_visible_and_unlocked_layers(&document.network_interface) {
 						let origin = graph_modification_utils::get_viewport_origin(layer, &document.network_interface);
 						overlay_context.dowel_pin(origin);