Insert new point on path

Changed files (5)

• modified icons/new_point_on_path.png
• modified libbirdfont/DrawingTools.vala
• modified libbirdfont/PenTool.vala
• modified libbirdfont/PointTool.vala
• modified libbirdfont/Tool.vala

Diff

diff --git a/icons/new_point_on_path.png b/icons/new_point_on_path.pngindex b9ce801..45bee85 100644Binary files a/icons/new_point_on_path.png and b/icons/new_point_on_path.png differdiff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex caea5fe..d4ded3e 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -156,10 +156,13 @@ public class DrawingTools : ToolCollection  { 		}); 		key_tools.add_tool (undo_tool); 		-		Tool inser_point_on_path_tool = new Tool ("new_point_on_path", t_("Insert new points in path"));+		bool insert_points = false;+		Tool inser_point_on_path_tool = new Tool ("new_point_on_path", t_("Insert new points on path"));+		inser_point_on_path_tool.select_action.connect ((self) => {+			insert_points = !insert_points;+			inser_point_on_path_tool.set_selected (insert_points);+		}); 		inser_point_on_path_tool.set_persistent (true);-		key_tools.add_tool (undo_tool);-		 		key_tools.add_tool (inser_point_on_path_tool);		 			 		// quadratic Bézier pointsdiff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex b5bbe79..57f79a1 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -136,6 +136,8 @@ public class PenTool : Tool { 					 			last_point_x = x; 			last_point_y = y;+			+			move_action (this, x, y); 		}); 		 		double_click_action.connect ((self, b, x, y) => {@@ -430,14 +432,13 @@ public class PenTool : Tool { 	public void press (int button, int x, int y, bool double_click) { 		Glyph? g = MainWindow.get_current_glyph (); 		Glyph glyph = (!) g;+		Toolbox tb = MainWindow.get_toolbox (); 		 		return_if_fail (g != null); -		if (!BirdFont.android || Toolbox.get_tool ("new_point_on_path").is_selected ()) {-			if (double_click) {-				glyph.insert_new_point_on_path (x, y);-				return;-			}+		if ((double_click && !BirdFont.android) || tb.get_tool ("new_point_on_path").is_selected ()) {+			glyph.insert_new_point_on_path (x, y);+			return; 		} 		 		if (button == 1) {diff --git a/libbirdfont/PointTool.vala b/libbirdfont/PointTool.valaindex e617f38..f292cf2 100644--- a/libbirdfont/PointTool.vala+++ b/libbirdfont/PointTool.vala@@ -42,7 +42,10 @@ public class PointTool : Tool { 		 		double_click_action.connect ((self, b, x, y) => { 			Tool p = pen ();-			p.double_click_action (p, b, x, y);+			+			if (!BirdFont.android) {+				p.double_click_action (p, b, x, y);+			} 		});  		release_action.connect ((self, b, x, y) => {diff --git a/libbirdfont/Tool.vala b/libbirdfont/Tool.valaindex 446f4d4..6709bce 100644--- a/libbirdfont/Tool.vala+++ b/libbirdfont/Tool.vala@@ -151,7 +151,7 @@ public class Tool : GLib.Object { 		} 	} 	-	static void show_tooltip () {+	public static void show_tooltip () { 		TimeoutSource timer_hide; 		 		// hide tooltip label later