The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

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

These changes was commited to the Birdfont repository Sat, 25 Jun 2016 20:08:35 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 25 Jun 2016 20:08:35 +0000 (22:08 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 25 Jun 2016 20:08:35 +0000 (22:08 +0200)
commit cdf33a0901935d0a867428fb2e6ab18b4c8848c3
tree 4150c82f7d68f2f71792da949c1ff9c1265cf2fe
parent 857d3ff16469123312118c7cc76a022b6c57da31
parent 2c6b5a7d3493b4806cbfd7f3b86cac5a73b379f9
Merge branch '2.x' of github.com:johanmattssonm/birdfont into 2.x

libbirdfont/KerningDisplay.vala
libbirdfont/TableLayout.vala
scripts/version.py
--- a/libbirdfont/KerningDisplay.vala +++ b/libbirdfont/KerningDisplay.vala @@ -487,7 +487,7 @@ } public override void selected_canvas () { - KeyBindings.set_require_modifier (true); + KeyBindings.set_require_modifier (true); } public void add_kerning_class (int index) {
--- a/libbirdfont/TableLayout.vala +++ b/libbirdfont/TableLayout.vala @@ -231,6 +231,7 @@ } public override void selected_canvas () { + KeyBindings.set_require_modifier (true); update_scrollbar (); GlyphCanvas.redraw (); } @@ -245,8 +246,12 @@ double h = content_height - allocation.height; scroll = percent * h; GlyphCanvas.redraw (); + } + + public override bool needs_modifier () { + return true; } } }
--- a/scripts/version.py +++ b/scripts/version.py @@ -13,7 +13,7 @@ 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