Move points along axis in bezier tool

Changed files (2)

• modified libbirdfont/BezierTool.vala
• modified libbirdfont/HiddenTools.vala

Diff

diff --git a/libbirdfont/BezierTool.vala b/libbirdfont/BezierTool.valaindex 0d62f40..4d7fdf5 100644--- a/libbirdfont/BezierTool.vala+++ b/libbirdfont/BezierTool.vala@@ -26,6 +26,7 @@ public class BezierTool : Tool { 	public const uint MOVE_LAST_HANDLE_RIGHT = 3; 	public const uint MOVE_LAST_HANDLE_LEFT = 4; 	public const uint MOVE_FIRST_HANDLE = 5;+	public const uint MOVE_HANDLE_ON_AXIS = 6; 	 	uint state = NONE; 	@@ -140,7 +141,15 @@ public class BezierTool : Tool { 			GridTool.tie_coordinate (ref px, ref py); 		} 		-		if (corner_node) {+		if (state == MOVE_HANDLE_ON_AXIS) {+			current_point = current_path.add (px, py);+			current_path.hide_end_handle = true;+			current_point.get_left_handle ().convert_to_line ();+			current_point.recalculate_linear_handles ();+			set_point_type ();+			corner_node = false;+			state = MOVE_POINT;+		} else if (corner_node) { 			if (current_path.is_open ()) { 				current_point = current_path.add (px, py); 				current_path.hide_end_handle = true;@@ -320,6 +329,24 @@ public class BezierTool : Tool { 			 			current_path.reset_stroke (); 			GlyphCanvas.redraw ();+		} else if (state == MOVE_HANDLE_ON_AXIS) {+			EditPointHandle h = current_point.get_right_handle ();+			double horizontal, vertical;+			+			vertical = Path.distance (px, h.parent.x, py, py);+			horizontal = Path.distance (h.parent.y, py, py, py);++			current_path.hide_end_handle = false;+			current_point.set_reflective_handles (true);+			current_point.convert_to_curve ();+						+			if (horizontal < vertical) {+				h.move_to_coordinate (px, current_point.y);+			} else {+				h.move_to_coordinate (current_point.x, py);+			}+						+			GlyphCanvas.redraw (); 		} 		 		if (current_path.points.size > 0) {@@ -386,6 +413,10 @@ public class BezierTool : Tool { 		current_point.set_reflective_handles (false); 		current_point.get_right_handle ().convert_to_curve (); 	}+	+	public void move_handle_on_axis () {+		state = MOVE_HANDLE_ON_AXIS;+	} }  }diff --git a/libbirdfont/HiddenTools.vala b/libbirdfont/HiddenTools.valaindex ad791d7..544889b 100644--- a/libbirdfont/HiddenTools.vala+++ b/libbirdfont/HiddenTools.vala@@ -55,7 +55,18 @@ public class HiddenTools : ToolCollection  { 		bezier_corner.is_tool_modifier = true; 		hidden_expander.add_tool (bezier_corner); 		bezier_corner.set_tool_visibility (false);-						++		Tool move_along_axis = new Tool ("bezier", t_("Move handle along axis"));+		move_along_axis.select_action.connect ((self) => {+			Tool t = MainWindow.get_toolbox ().get_current_tool ();+			if (t is BezierTool) {+				DrawingTools.bezier_tool.move_handle_on_axis ();+			}+		});+		move_along_axis.is_tool_modifier = true;+		hidden_expander.add_tool (move_along_axis);+		move_along_axis.set_tool_visibility (false);+								 		expanders.add (hidden_expander); 	}