fix: pin only if moved in first place

Author: mTvare6

editor/src/consts.rs

@@ -134,7 +134,6 @@ pub const SCALE_EFFECT: f64 = 0.5;
 
 // COLORS
 pub const COLOR_OVERLAY_BLUE: &str = "#00a8ff";
-pub const COLOR_OVERLAY_BLUE_50: &str = "rgba(0, 168, 255, 0.5)";
 pub const COLOR_OVERLAY_YELLOW: &str = "#ffc848";
 pub const COLOR_OVERLAY_GREEN: &str = "#63ce63";
 pub const COLOR_OVERLAY_RED: &str = "#ef5454";

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

@@ -1,6 +1,6 @@
 use super::utility_functions::overlay_canvas_context;
 use crate::consts::{
-	COLOR_OVERLAY_BLUE, COLOR_OVERLAY_BLUE_50, COLOR_OVERLAY_GREEN, COLOR_OVERLAY_RED, COLOR_OVERLAY_WHITE, COLOR_OVERLAY_YELLOW, COMPASS_ROSE_ARROW_SIZE, COMPASS_ROSE_HOVER_RING_DIAMETER,
+	COLOR_OVERLAY_BLUE, COLOR_OVERLAY_GREEN, COLOR_OVERLAY_ORANGE, 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;
@@ -431,10 +431,7 @@ impl OverlayContext {
 
 	pub fn draw_scale(&mut self, start: DVec2, scale: f64, radius: f64, text: &str) {
 		let sign = scale.signum();
-		let mut fill_color = graphene_std::Color::from_rgb_str(crate::consts::COLOR_OVERLAY_WHITE.strip_prefix('#').unwrap())
-			.unwrap()
-			.with_alpha(0.05)
-			.to_rgba_hex_srgb();
+		let mut fill_color = Color::from_rgb_str(COLOR_OVERLAY_WHITE.strip_prefix('#').unwrap()).unwrap().with_alpha(0.05).to_rgba_hex_srgb();
 		fill_color.insert(0, '#');
 		let fill_color = Some(fill_color.as_str());
 		self.line(start + DVec2::X * radius * sign, start + DVec2::X * (radius * scale), None, None);
@@ -471,10 +468,7 @@ impl OverlayContext {
 
 		// Hover ring
 		if show_hover_ring {
-			let mut fill_color = graphene_std::Color::from_rgb_str(COLOR_OVERLAY_BLUE.strip_prefix('#').unwrap())
-				.unwrap()
-				.with_alpha(0.5)
-				.to_rgba_hex_srgb();
+			let mut fill_color = Color::from_rgb_str(COLOR_OVERLAY_BLUE.strip_prefix('#').unwrap()).unwrap().with_alpha(0.5).to_rgba_hex_srgb();
 			fill_color.insert(0, '#');
 
 			self.render_context.set_line_width(HOVER_RING_STROKE_WIDTH);
@@ -560,7 +554,7 @@ impl OverlayContext {
 
 	pub fn dowel_pin(&mut self, position: DVec2, angle: f64, color: Option<&str>) {
 		let (x, y) = (position.round() - DVec2::splat(0.5)).into();
-		let color = color.unwrap_or(COLOR_OVERLAY_YELLOW);
+		let color = color.unwrap_or(COLOR_OVERLAY_ORANGE);
 
 		self.start_dpi_aware_transform();
 
@@ -637,9 +631,11 @@ impl OverlayContext {
 	pub fn outline_overlay_bezier(&mut self, bezier: Bezier, transform: DAffine2) {
 		self.start_dpi_aware_transform();
 
+		let color = Color::from_rgb_str(COLOR_OVERLAY_BLUE.strip_prefix('#').unwrap()).unwrap().with_alpha(0.05).to_rgba_hex_srgb();
+
 		self.render_context.begin_path();
 		self.bezier_command(bezier, transform, true);
-		self.render_context.set_stroke_style_str(COLOR_OVERLAY_BLUE_50);
+		self.render_context.set_stroke_style_str(&color);
 		self.render_context.set_line_width(4.);
 		self.render_context.stroke();
 

editor/src/messages/tool/common_functionality/pivot.rs

@@ -12,12 +12,13 @@ use glam::{DAffine2, DVec2};
 use graphene_std::{transform::ReferencePoint, vector::ManipulatorPointId};
 use std::fmt;
 
-pub fn pin_pivot_widget(disabled: bool, source: Source) -> WidgetHolder {
-	IconButton::new(if disabled { "PinInactive" } else { "PinActive" }, 24)
-		.tooltip(if disabled { "Pin Transform Pivot" } else { "Unpin Transform Pivot" })
+pub fn pin_pivot_widget(inactive: bool, enabled: bool, source: Source) -> WidgetHolder {
+	IconButton::new(if inactive { "PinInactive" } else { "PinActive" }, 24)
+		.tooltip(if inactive { "Pin Transform Pivot" } else { "Unpin Transform Pivot" })
 		.on_update(move |_| match source {
-			Source::Select => SelectToolMessage::SelectOptions(SelectOptionsUpdate::TogglePivotPinned()).into(),
-			Source::Path => PathToolMessage::UpdateOptions(PathOptionsUpdate::TogglePivotPinned()).into(),
+			Source::Select if enabled => SelectToolMessage::SelectOptions(SelectOptionsUpdate::TogglePivotPinned()).into(),
+			Source::Path if enabled => PathToolMessage::UpdateOptions(PathOptionsUpdate::TogglePivotPinned()).into(),
+			_ => Message::NoOp
 		})
 		.widget_holder()
 }

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

@@ -271,7 +271,7 @@ impl LayoutHolder for PathTool {
 		let has_somrthing = !self.tool_data.saved_points_before_anchor_convert_smooth_sharp.is_empty();
 		let _pivot_reference = pivot_reference_point_widget(has_somrthing || !self.tool_data.dot.state.is_pivot(), self.tool_data.dot.pivot.to_pivot_position(), Source::Path);
 
-		let _pin_pivot = pin_pivot_widget(self.tool_data.dot.pin_inactive(), Source::Path);
+		let _pin_pivot = pin_pivot_widget(self.tool_data.dot.pin_inactive(), false, Source::Path);
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![LayoutGroup::Row {
 			widgets: vec![

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

@@ -214,7 +214,9 @@ impl LayoutHolder for SelectTool {
 
 		// Pivot pin
 		widgets.push(Separator::new(SeparatorType::Related).widget_holder());
-		widgets.push(pin_pivot_widget(self.tool_data.dot.pin_inactive(), Source::Select));
+
+		let pin_enabled = self.tool_data.dot.pivot.old_pivot_position == ReferencePoint::None;
+		widgets.push(pin_pivot_widget(self.tool_data.dot.pin_inactive(), pin_enabled, Source::Select));
 
 		// Align
 		let disabled = self.tool_data.selected_layers_count < 2;
@@ -807,7 +809,7 @@ impl Fsm for SelectToolFsmState {
 					}
 				}
 				if let Some(origin) = active_origin {
-					overlay_context.dowel_pin(origin, origin_angle, Some(COLOR_OVERLAY_ORANGE));
+					overlay_context.dowel_pin(origin, origin_angle, Some(COLOR_OVERLAY_YELLOW));
 				}
 
 				let has_layers = document.network_interface.selected_nodes().has_selected_nodes();