Suppress menu events when message dialog is open

Changed files (2)

• modified libbirdfont/LicenseDialog.vala
• modified libbirdfont/TabContent.vala

Diff

diff --git a/libbirdfont/LicenseDialog.vala b/libbirdfont/LicenseDialog.valaindex 3d7ac52..85575a2 100644--- a/libbirdfont/LicenseDialog.vala+++ b/libbirdfont/LicenseDialog.vala@@ -35,7 +35,7 @@ public class LicenseDialog : Dialog { 		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 (); 		});diff --git a/libbirdfont/TabContent.vala b/libbirdfont/TabContent.valaindex 83ddc70..ba20f15 100644--- a/libbirdfont/TabContent.vala+++ b/libbirdfont/TabContent.vala@@ -97,9 +97,7 @@ public class TabContent : GLib.Object { 			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 class TabContent : GLib.Object { 	}  	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 class TabContent : GLib.Object { 	}  	public static void key_release (uint keyval) {-		if (MenuTab.has_suppress_event ()) {+		if (MenuTab.has_suppress_event () || dialog.visible) { 			return; 		}