X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2Fdialogs%2FLightweightDialog.java;h=5649a1571cdefa0fa3f62f88f8abdcb356f47080;hb=c89baa210b116d5ccf37896b833e50c4d55ddea2;hp=e816ec718dbb4fd30ad81e44af83d0fbc523d616;hpb=7fa402d36e0e194424589f4d7efeae5610d2c6eb;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java
index e816ec718..5649a1571 100644
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java
@@ -15,6 +15,8 @@
  */
 package org.argeo.eclipse.ui.dialogs;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
@@ -32,6 +34,8 @@ import org.eclipse.swt.widgets.Shell;
 
 /** Generic lightweight dialog, not based on JFace. */
 public class LightweightDialog {
+	private final static Log log = LogFactory.getLog(LightweightDialog.class);
+
 	// must be the same value as org.eclipse.jface.window.Window#OK
 	public final static int OK = 0;
 	// must be the same value as org.eclipse.jface.window.Window#CANCEL
@@ -66,12 +70,14 @@ public class LightweightDialog {
 	public int open() {
 		if (foregoundShell != null)
 			throw new EclipseUiException("There is already a shell");
-		backgroundShell = new Shell(parentShell, SWT.DIALOG_TRIM | SWT.ON_TOP);
+		backgroundShell = new Shell(parentShell, SWT.ON_TOP);
 		backgroundShell.setFullScreen(true);
+		// if (parentShell != null) {
+		// backgroundShell.setBounds(parentShell.getBounds());
+		// } else
 		// backgroundShell.setMaximized(true);
 		backgroundShell.setAlpha(128);
 		backgroundShell.setBackground(getDisplay().getSystemColor(SWT.COLOR_BLACK));
-		backgroundShell.open();
 		foregoundShell = new Shell(backgroundShell, SWT.NO_TRIM | SWT.ON_TOP);
 		if (title != null)
 			setTitle(title);
@@ -81,7 +87,7 @@ public class LightweightDialog {
 		// shell.pack();
 		// shell.layout();
 
-		Rectangle shellBounds = Display.getCurrent().getBounds();// RAP
+		Rectangle shellBounds = parentShell != null ? parentShell.getBounds() : Display.getCurrent().getBounds();// RAP
 		Point dialogSize = foregoundShell.getSize();
 		int x = shellBounds.x + (shellBounds.width - dialogSize.x) / 2;
 		int y = shellBounds.y + (shellBounds.height - dialogSize.y) / 2;
@@ -92,6 +98,8 @@ public class LightweightDialog {
 
 			@Override
 			public void shellDeactivated(ShellEvent e) {
+				if (hasChildShells())
+					return;
 				if (returnCode == null)// not yet closed
 					closeShell(CANCEL);
 			}
@@ -103,6 +111,7 @@ public class LightweightDialog {
 
 		});
 
+		backgroundShell.open();
 		foregoundShell.open();
 		// after the foreground shell has been opened
 		backgroundShell.addFocusListener(new FocusListener() {
@@ -114,19 +123,36 @@ public class LightweightDialog {
 
 			@Override
 			public void focusGained(FocusEvent event) {
+				if (hasChildShells())
+					return;
 				if (returnCode == null)// not yet closed
 					closeShell(CANCEL);
 			}
 		});
 
 		if (block) {
-			runEventLoop(foregoundShell);
+			try {
+				runEventLoop(foregoundShell);
+			} catch (ThreadDeath t) {
+				returnCode = CANCEL;
+				if (log.isTraceEnabled())
+					log.error("Thread death, canceling dialog", t);
+			} catch (Throwable t) {
+				returnCode = CANCEL;
+				log.error("Cannot open blocking lightweight dialog", t);
+			}
 		}
 		if (returnCode == null)
 			returnCode = OK;
 		return returnCode;
 	}
 
+	private boolean hasChildShells() {
+		if (foregoundShell == null)
+			return false;
+		return foregoundShell.getShells().length != 0;
+	}
+
 	// public synchronized int openAndWait() {
 	// open();
 	// while (returnCode == null)
@@ -186,6 +212,10 @@ public class LightweightDialog {
 		block = shouldBlock;
 	}
 
+	public void pack() {
+		foregoundShell.pack();
+	}
+
 	private void runEventLoop(Shell loopShell) {
 		Display display;
 		if (foregoundShell == null) {
@@ -224,8 +254,12 @@ public class LightweightDialog {
 
 	public void setTitle(String title) {
 		this.title = title;
-		if (getForegoundShell() != null)
+		if (title != null && getForegoundShell() != null)
 			getForegoundShell().setText(title);
 	}
 
+	public Integer getReturnCode() {
+		return returnCode;
+	}
+
 }
\ No newline at end of file