The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Suppress menu events when message dialog is open

These changes was commited to the Birdfont repository Sat, 24 Oct 2015 13:25:32 +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, 24 Oct 2015 13:25:32 +0000 (15:25 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 24 Oct 2015 13:25:32 +0000 (15:25 +0200)
commit e0fd488da9ba68f572389c6782713ae39b82fcd6
tree 87ef7b3e6643aba1e5a7a17a25a2fb8fbe6c723a
parent da0cf4b6a540baefe8d69fd5169ac67aff6a6209
Suppress menu events when message dialog is open

libbirdfont/LicenseDialog.vala
libbirdfont/TabContent.vala
--- a/libbirdfont/LicenseDialog.vala +++ b/libbirdfont/LicenseDialog.vala @@ -35,7 +35,7 @@ agreement.text_color = Theme.get_color ("Text Tool Box"); agreement.set_text ("This is the freeware version of BirdFont. You may use it for creating fonts under the SIL Open Font License.\n\nWhich license do you want to use for your font?"); - decline = new Button ("Commercial"); + decline = new Button ("Commercial License"); decline.action.connect (() => { commercial (); });
--- a/libbirdfont/TabContent.vala +++ b/libbirdfont/TabContent.vala @@ -97,9 +97,7 @@ if (dialog.visible) { dialog.allocation = allocation; dialog.draw (cr); - } - - if (menu.show_menu) { + } else if (menu.show_menu) { menu.draw (allocation, cr); } @@ -131,7 +129,7 @@ } public static void key_press (uint keyval) { - if (MenuTab.has_suppress_event ()) { + if (MenuTab.has_suppress_event () || dialog.visible) { return; } @@ -153,7 +151,7 @@ } public static void key_release (uint keyval) { - if (MenuTab.has_suppress_event ()) { + if (MenuTab.has_suppress_event () || dialog.visible) { return; }