Linux leaveNestedEventLoop now behaves like Mac and Windows

Author: beldenfox

modules/javafx.graphics/src/main/native-glass/gtk/GlassApplication.cpp

@@ -71,6 +71,8 @@ static gboolean call_runnable (gpointer data)
         javaVM->DetachCurrentThread();
     }
 
+    glass_maybe_leave_nested_event_loop();
+
     return FALSE;
 }
 
@@ -304,6 +306,7 @@ JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkApplication_enterNestedEvent
     (void)env;
     (void)obj;
 
+    glass_set_leave_nested_event_loop(false);
     gtk_main();
 }
 
@@ -318,7 +321,7 @@ JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkApplication_leaveNestedEvent
     (void)env;
     (void)obj;
 
-    gtk_main_quit();
+    glass_set_leave_nested_event_loop(true);
 }
 
 /*

modules/javafx.graphics/src/main/native-glass/gtk/GlassTimer.cpp

@@ -97,6 +97,8 @@ static gboolean call_runnable_in_timer
         if (envStatus == JNI_EDETACHED) {
             javaVM->DetachCurrentThread();
         }
+
+        glass_maybe_leave_nested_event_loop();
     }
     return TRUE;
 }

modules/javafx.graphics/src/main/native-glass/gtk/glass_general.cpp

@@ -462,6 +462,19 @@ gboolean check_and_clear_exception(JNIEnv *env) {
     return FALSE;
 }
 
+static bool should_leave_nested_event_loop = false;
+
+void glass_set_leave_nested_event_loop(bool v) {
+    should_leave_nested_event_loop = v;
+}
+
+void glass_maybe_leave_nested_event_loop() {
+    if (should_leave_nested_event_loop) {
+        gtk_main_quit();
+        should_leave_nested_event_loop = false;
+    }
+}
+
 // The returned string should be freed with g_free().
 gchar* get_application_name() {
     gchar* ret = NULL;

modules/javafx.graphics/src/main/native-glass/gtk/glass_general.h

@@ -277,6 +277,9 @@ struct jni_exception: public std::exception {
 
 #define LOG_EXCEPTION(env) check_and_clear_exception(env);
 
+    void glass_set_leave_nested_event_loop(bool v);
+    void glass_maybe_leave_nested_event_loop();
+
     gchar* get_application_name();
     void glass_throw_exception(JNIEnv * env,
             const char * exceptionClass,