Merge ../birdfont-2.x

Changed files (4)

• modified libbirdfont/DrawingTools.vala
• modified libbirdfont/EditPoint.vala
• modified libbirdfont/EditPointHandle.vala
• modified libbirdfont/PenTool.vala

Diff

diff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex 837202e..f793efb 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -542,7 +542,7 @@ public class DrawingTools : ToolCollection  { 					 					if (!p.path.is_open () || !end_point) { 						p.point.set_reflective_handles (!symmetrical);-						p.point.process_symmetrical_handles ();+						p.point.get_right_handle ().process_symmetrical_handle (); 						 						if (symmetrical) { 							ep.point.set_tie_handle (false);diff --git a/libbirdfont/EditPoint.vala b/libbirdfont/EditPoint.valaindex d5d6be7..4a41cb8 100644--- a/libbirdfont/EditPoint.vala+++ b/libbirdfont/EditPoint.vala@@ -267,12 +267,6 @@ public class EditPoint : GLib.Object { 		tie_handles = tie; 	} 	-	public void process_symmetrical_handles () {-		process_tied_handle ();-		right_handle.process_symmetrical_handle ();-		left_handle.process_symmetrical_handle ();-	}-	 	public void to_curve () { 		convert_from_line_to_curve (get_right_handle ()); 		convert_from_line_to_curve (get_left_handle ());diff --git a/libbirdfont/EditPointHandle.vala b/libbirdfont/EditPointHandle.valaindex efc5cf0..6425cc2 100644--- a/libbirdfont/EditPointHandle.vala+++ b/libbirdfont/EditPointHandle.vala@@ -48,7 +48,7 @@ public class EditPointHandle : GLib.Object { 			}  			if (parent.reflective_point) {-				parent.process_symmetrical_handles ();+				process_symmetrical_handle (); 			} 			 			process_connected_handle ();@@ -75,7 +75,7 @@ public class EditPointHandle : GLib.Object { 			}  			if (parent.reflective_point) {-				parent.process_symmetrical_handles ();+				process_symmetrical_handle (); 			} 			 			process_connected_handle ();diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex b61018e..ada8c02 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -818,7 +818,7 @@ public class PenTool : Tool { 				GridTool.tie_coordinate (ref coordinate_x, ref coordinate_y); 				delta_coordinate_x = coordinate_x - last_point_x; 				delta_coordinate_y = coordinate_y - last_point_y;			-				selected_handle.move_to_coordinate (selected_handle.x + delta_coordinate_x, selected_handle.y + delta_coordinate_y);+				selected_handle.move_delta_coordinate (delta_coordinate_x, delta_coordinate_y); 			} else if (GridTool.has_ttf_grid ()) { 				coordinate_x = Glyph.path_coordinate_x (x); 				coordinate_y = Glyph.path_coordinate_y (y);@@ -829,8 +829,8 @@ public class PenTool : Tool { 			} else { 				coordinate_x = Glyph.path_coordinate_x (x); 				coordinate_y = Glyph.path_coordinate_y (y);-				selected_handle.x = coordinate_x;-				selected_handle.y = coordinate_y;+				+				selected_handle.move_to_coordinate (coordinate_x, coordinate_y); 				 				if (on_axis) { 					double tied_x = 0;@@ -838,9 +838,8 @@ public class PenTool : Tool { 					  					PointTool.tie_angle (selected_handle.parent.x, selected_handle.parent.y, 							coordinate_x, coordinate_y, out tied_x, out tied_y);-							-					selected_handle.x = tied_x;-					selected_handle.y = tied_y;+					+					selected_handle.move_to_coordinate (tied_x, tied_y); 				} 			} @@ -1250,7 +1249,7 @@ public class PenTool : Tool { 				// alt+click creates a point with symmetrical handles 				if (KeyBindings.has_alt () || KeyBindings.has_ctrl ()) { 					selected_point.set_reflective_handles (true);-					selected_point.process_symmetrical_handles ();+					selected_point.get_right_handle ().process_symmetrical_handle (); 					GlyphCanvas.redraw (); 				} 			}