Bug 551302 - [GTK] Progress view hides contents when system dialog is
opened
SWT can not process deferred layout requests if events are
processed in an external (modal) event loop.
For GTK this only happens while a system dialog is shown e.g.
ColorDialog or FileDialog.
The fix is to not defer layouts while an external event loop is running.
Change-Id: Icceebf6c6f3fe3c7dd8f45d97c13a73338f2ddfe
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
index a7ebaea..e434b5d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
@@ -391,6 +391,8 @@
oldModal = display.getData (GET_MODAL_DIALOG);
display.setData (SET_MODAL_DIALOG, this);
}
+ String key = "org.eclipse.swt.internal.gtk.externalEventLoop"; //$NON-NLS-1$
+ display.setData (key, Boolean.TRUE);
display.sendPreExternalEventDispatchEvent ();
int response = GTK.gtk_dialog_run (handle);
/*
@@ -400,6 +402,7 @@
* thread leaves the GTK lock acquired by the function above.
*/
if (!GTK.GTK4) GDK.gdk_threads_leave();
+ display.setData (key, Boolean.FALSE);
display.sendPostExternalEventDispatchEvent ();
if (GTK.gtk_window_get_modal (handle)) {
display.setData (SET_MODAL_DIALOG, oldModal);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
index 510bf68..db73040 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
@@ -176,6 +176,7 @@
signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
}
+ display.externalEventLoop = true;
display.sendPreExternalEventDispatchEvent ();
int response = GTK.gtk_dialog_run (handle);
/*
@@ -185,6 +186,7 @@
* thread leaves the GTK lock acquired by the function above.
*/
if (!GTK.GTK4) GDK.gdk_threads_leave();
+ display.externalEventLoop = false;
display.sendPostExternalEventDispatchEvent ();
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.g_signal_remove_emission_hook (signalId, hookId);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index 33c1050..537c383 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -1252,7 +1252,7 @@
composite = child.parent;
}
}
- if ((flags & SWT.DEFER) != 0) {
+ if (!display.externalEventLoop && (flags & SWT.DEFER) != 0) {
setLayoutDeferred (true);
display.addLayoutDeferred (this);
}
@@ -1262,7 +1262,7 @@
} else {
if (layout == null && (flags & SWT.ALL) == 0) return;
markLayout ((flags & SWT.CHANGED) != 0, (flags & SWT.ALL) != 0);
- if ((flags & SWT.DEFER) != 0) {
+ if (!display.externalEventLoop && (flags & SWT.DEFER) != 0) {
setLayoutDeferred (true);
display.addLayoutDeferred (this);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
index 8cb692e..825f8ea 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -182,6 +182,7 @@
signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
}
+ display.externalEventLoop = true;
display.sendPreExternalEventDispatchEvent ();
int response = GTK.gtk_native_dialog_run (handle);
/*
@@ -191,6 +192,7 @@
* thread leaves the GTK lock acquired by the function above.
*/
if (!GTK.GTK4) GDK.gdk_threads_leave();
+ display.externalEventLoop = false;
display.sendPostExternalEventDispatchEvent ();
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.g_signal_remove_emission_hook (signalId, hookId);
@@ -283,6 +285,7 @@
signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
}
+ display.externalEventLoop = true;
display.sendPreExternalEventDispatchEvent ();
int response = GTK.gtk_dialog_run (handle);
/*
@@ -292,6 +295,7 @@
* thread leaves the GTK lock acquired by the function above.
*/
if (!GTK.GTK4) GDK.gdk_threads_leave();
+ display.externalEventLoop = false;
display.sendPostExternalEventDispatchEvent ();
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.g_signal_remove_emission_hook (signalId, hookId);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index 2219d48..a6b2397 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -142,10 +142,12 @@
static String APP_VERSION = ""; //$NON-NLS-1$
static final String DISPATCH_EVENT_KEY = "org.eclipse.swt.internal.gtk.dispatchEvent"; //$NON-NLS-1$
static final String ADD_WIDGET_KEY = "org.eclipse.swt.internal.addWidget"; //$NON-NLS-1$
+ static final String EXTERNAL_EVENT_LOOP_KEY = "org.eclipse.swt.internal.gtk.externalEventLoop"; //$NON-NLS-1$
long [] closures, closuresProc;
int [] closuresCount;
int [] signalIds;
long shellMapProcClosure;
+ boolean externalEventLoop; // events are dispatched outside SWT, e.g. when system dialog is open
/* Widget Table */
int [] indexTable;
@@ -5173,6 +5175,11 @@
removeIdleProc ();
return;
}
+ if (key.equals (EXTERNAL_EVENT_LOOP_KEY)) {
+ Boolean data = (Boolean) value;
+ externalEventLoop = data != null && data.booleanValue ();
+ return;
+ }
/* Remove the key/value pair */
if (value == null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
index c5ba74d..59049a2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
@@ -336,6 +336,7 @@
signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
}
+ display.externalEventLoop = true;
display.sendPreExternalEventDispatchEvent ();
int response = 0;
response = GTK.gtk_native_dialog_run(handle);
@@ -346,6 +347,7 @@
* thread leaves the GTK lock acquired by the function above.
*/
if (!GTK.GTK4) GDK.gdk_threads_leave();
+ display.externalEventLoop = false;
display.sendPostExternalEventDispatchEvent ();
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.g_signal_remove_emission_hook (signalId, hookId);
@@ -394,6 +396,7 @@
signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
}
+ display.externalEventLoop = true;
display.sendPreExternalEventDispatchEvent ();
int response = GTK.gtk_dialog_run (handle);
/*
@@ -403,6 +406,7 @@
* thread leaves the GTK lock acquired by the function above.
*/
if (!GTK.GTK4) GDK.gdk_threads_leave();
+ display.externalEventLoop = false;
display.sendPostExternalEventDispatchEvent ();
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.g_signal_remove_emission_hook (signalId, hookId);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
index f2e5665..6949d0d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
@@ -189,6 +189,7 @@
signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
}
+ display.externalEventLoop = true;
display.sendPreExternalEventDispatchEvent ();
int response = GTK.gtk_dialog_run (handle);
/*
@@ -198,6 +199,7 @@
* thread leaves the GTK lock acquired by the function above.
*/
if (!GTK.GTK4) GDK.gdk_threads_leave();
+ display.externalEventLoop = false;
display.sendPostExternalEventDispatchEvent ();
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.g_signal_remove_emission_hook (signalId, hookId);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
index 5b2746e..7583495 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
@@ -188,6 +188,7 @@
signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
}
+ display.externalEventLoop = true;
display.sendPreExternalEventDispatchEvent ();
int response = GTK.gtk_dialog_run (handle);
/*
@@ -197,6 +198,7 @@
* thread leaves the GTK lock acquired by the function above.
*/
if (!GTK.GTK4) GDK.gdk_threads_leave();
+ display.externalEventLoop = false;
display.sendPostExternalEventDispatchEvent ();
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.g_signal_remove_emission_hook (signalId, hookId);
