Merge branch '2.x' of github.com:johanmattssonm/birdfont into 2.x

Changed files (2)

• modified libbirdfont/OtfFeatureTable.vala
• modified scripts/version.py

Diff

diff --git a/libbirdfont/OtfFeatureTable.vala b/libbirdfont/OtfFeatureTable.valaindex 0a60b25..37cbc7a 100644--- a/libbirdfont/OtfFeatureTable.vala+++ b/libbirdfont/OtfFeatureTable.vala@@ -34,11 +34,26 @@ public class OtfFeatureTable : Table { 	Gee.ArrayList<AlternateItem> undo_items; 	// FIXME: implement redo 	+	bool ignore_input = false;+	 	public OtfFeatureTable (GlyphCollection? gc) { 		glyph_collection = gc; 		undo_items = new Gee.ArrayList<AlternateItem> (); 	} +	public override void selected_canvas () {+		ignore_input = true; // make sure that tripple clicks in overview are ignored++		TimeoutSource input_delay = new TimeoutSource (250);+		input_delay.set_callback(() => {+			ignore_input = false;+			return false;+		});+		input_delay.attach (null);+		+		base.selected_canvas ();+	}+ 	public override Gee.ArrayList<Row> get_rows () { 		return rows; 	}@@ -49,6 +64,10 @@ public class OtfFeatureTable : Table { 		String s; 		AlternateItem a; 		+		if (ignore_input) {+			return;+		}+		 		if (row_index == SOURCE_GLYPH) { 			GlyphSelection gs = new GlyphSelection (); 			diff --git a/scripts/version.py b/scripts/version.pyindex 5c2bd85..c9dc518 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. """ -VERSION = '2.16.6'+VERSION = '2.16.7' SO_VERSION_MAJOR = '36' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR