Merge branch 'master' of github.com:johanmattssonm/birdfont

Changed files (3)

• modified libbirdfont/CircleTool.vala
• modified libbirdfont/Font.vala
• modified libbirdfont/Glyph.vala

Diff

diff --git a/libbirdfont/CircleTool.vala b/libbirdfont/CircleTool.valaindex 0cb8434..45bb232 100644--- a/libbirdfont/CircleTool.vala+++ b/libbirdfont/CircleTool.vala@@ -138,6 +138,8 @@ public class CircleTool : Tool { 			} 		} +		path.update_region_boundaries ();+ 		return path; 	} 	@@ -165,6 +167,8 @@ public class CircleTool : Tool { 			} 		} +		path.update_region_boundaries ();+		 		return path; 	} 	diff --git a/libbirdfont/Font.vala b/libbirdfont/Font.valaindex 7f66b06..b9804cb 100644--- a/libbirdfont/Font.vala+++ b/libbirdfont/Font.vala@@ -188,6 +188,17 @@ public class Font : GLib.Object { 		font_deleted (); 	} +<<<<<<< HEAD+=======+	public string? get_export_directory () {+#if MAC+		return export_directory;+#else+		return get_path ();+#endif+	}+	+>>>>>>> 94139878f182ed4647645f72572bd764efff51f7 	public bool has_svg_glyph () { 		for (int glyph_index = 0; glyph_index < glyph_name.length (); glyph_index++) { 			GlyphCollection gc = glyph_name.nth (glyph_index);diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 1f8f6b1..fb55da3 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -1823,6 +1823,7 @@ public class Glyph : FontDisplay { 		undo_list.remove_at (undo_list.size - 1);  		DrawingTools.update_layers ();+		 		PenTool.update_selected_points ();  		clear_active_paths ();@@ -1877,6 +1878,11 @@ public class Glyph : FontDisplay { 			add_active_object (p); 		} +		PathList pl = LayerUtils.get_all_paths (layers);+		foreach (Path path in pl.paths) {+			path.update_region_boundaries ();+		}+ 		redraw_area (0, 0, allocation.width, allocation.height); 	}