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

Changed files (3)

• modified libbirdfont/Menu.vala
• modified libbirdfont/MenuTab.vala
• modified libbirdfont/SpacingData.vala

Diff

diff --git a/libbirdfont/Menu.vala b/libbirdfont/Menu.valaindex ae5e524..d23473a 100644--- a/libbirdfont/Menu.vala+++ b/libbirdfont/Menu.vala@@ -465,7 +465,7 @@ public class Menu : GLib.Object { 				 				display = current_display.get_name (); 				-				if (!(display == "Kerning" && display == "Spacing" && item.modifiers == NONE)) {+				if (!(display == "Kerning" && display == "Spacing" && display != "Preview" && item.modifiers == NONE)) { 					if (!SettingsDisplay.update_key_bindings  						&& (item.display == "" || item.display == display)) { 						item.action ();@@ -476,8 +476,10 @@ public class Menu : GLib.Object { 						 						if (!tm.tool.is_tool_modifier) { 							MainWindow.get_toolbox ().set_current_tool (tm.tool);+							return; 						} else { 							tm.tool.select_action (tm.tool);+							return; 						} 					} 				}diff --git a/libbirdfont/MenuTab.vala b/libbirdfont/MenuTab.valaindex 73c5c8d..cce3539 100644--- a/libbirdfont/MenuTab.vala+++ b/libbirdfont/MenuTab.vala@@ -360,6 +360,7 @@ public class MenuTab : FontDisplay { 		}	 			 		dialog.overwrite_signal.connect (() => {+			KeyBindings.set_modifier (NONE); 			tab_bar.add_unique_tab (new Preview (), true); 			PreviewTools.update_preview (); 		});@@ -465,6 +466,11 @@ public class MenuTab : FontDisplay { 	} 	 	public static void simplify_path () {+		if (suppress_event) {+			warn_if_test ("Event suppressed");+			return;+		}+		 		Task t = new Task (); 		t.task.connect (simplify); 		MainWindow.native_window.run_background_thread (t);diff --git a/libbirdfont/SpacingData.vala b/libbirdfont/SpacingData.valaindex 549428b..28ce3c0 100644--- a/libbirdfont/SpacingData.vala+++ b/libbirdfont/SpacingData.vala@@ -21,7 +21,7 @@ public class SpacingData : GLib.Object { 	public KerningClasses kerning_classes; 	 	public Gee.ArrayList<SpacingClass> classes = new Gee.ArrayList<SpacingClass> ();-	Gee.ArrayList<String> connections = new Gee.ArrayList<String> ();+	Gee.ArrayList<string> connections = new Gee.ArrayList<string> ();  	public SpacingData (KerningClasses kerning) { 		kerning_classes = kerning;@@ -32,15 +32,14 @@ public class SpacingData : GLib.Object { 	}  	public Gee.ArrayList<string> get_all_connections (string glyph) {-		String s; 		Gee.ArrayList<string> c = new Gee.ArrayList<string> (); 		 		connections.clear (); 		 		add_connections (glyph); 		-		foreach (String t in connections) {-			c.add (t.data.dup ());+		foreach (string t in connections) {+			c.add (t.dup ()); 		} 		 		connections.clear ();@@ -49,8 +48,8 @@ public class SpacingData : GLib.Object { 	} 	 	bool has_connection (string s) {-		foreach (String t in connections) {-			if (t.data == s) {+		foreach (string t in connections) {+			if (t == s) { 				return true; 			} 		}@@ -59,7 +58,7 @@ public class SpacingData : GLib.Object { 	} 	 	public void add_connections (string glyph) {-		String sb = new String (glyph);+		string sb = glyph; 		 		connections.add (sb); 		@@ -119,15 +118,6 @@ public class SpacingData : GLib.Object { 		 		KerningTools.update_spacing_classes (); 	}-	-	class String : GLib.Object {-		-		public string data;-		-		public String (string s) {-			data = s.dup ();-		}	-	} }  }