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

Changed files (3)

• modified libbirdfont/KerningDisplay.vala
• modified libbirdfont/TableLayout.vala
• modified scripts/version.py

Diff

diff --git a/libbirdfont/KerningDisplay.vala b/libbirdfont/KerningDisplay.valaindex 9c8a7ae..edd7206 100644--- a/libbirdfont/KerningDisplay.vala+++ b/libbirdfont/KerningDisplay.vala@@ -487,7 +487,7 @@ public class KerningDisplay : FontDisplay { 	} 	 	public override void selected_canvas () {-		KeyBindings.set_require_modifier (true);		+		KeyBindings.set_require_modifier (true); 	} 	 	public void add_kerning_class (int index) {diff --git a/libbirdfont/TableLayout.vala b/libbirdfont/TableLayout.valaindex aa95cd8..7699725 100644--- a/libbirdfont/TableLayout.vala+++ b/libbirdfont/TableLayout.vala@@ -231,6 +231,7 @@ public class TableLayout : FontDisplay { 	} 	 	public override void selected_canvas () {+		KeyBindings.set_require_modifier (true); 		update_scrollbar (); 		GlyphCanvas.redraw (); 	}@@ -246,6 +247,10 @@ public class TableLayout : FontDisplay { 		scroll = percent * h; 		GlyphCanvas.redraw (); 	}++	public override bool needs_modifier () {+		return true;+	} }  }diff --git a/scripts/version.py b/scripts/version.pyindex 80c4dee..9a2c52a 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.4'+VERSION = '2.16.5' SO_VERSION_MAJOR = '36' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR