Bug 289181 - [JFace] initial size & location of Window is never set if av20130211-180854

menu bar is displayed

2 files changed, 4 insertions, 1 deletions

diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/window/ApplicationWindow.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/window/ApplicationWindow.java
index 5245b48a6a9..ce5ce50ebe0 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/window/ApplicationWindow.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/window/ApplicationWindow.java
@@ -352,7 +352,9 @@ public class ApplicationWindow extends Window implements IRunnableContext {
      */
     protected void createTrimWidgets(Shell shell) {
         if (menuBarManager != null) {
+        	boolean resizeHasOccurredBackup = this.resizeHasOccurred;
         	shell.setMenuBar(menuBarManager.createMenuBar((Decorations) shell));
+        	this.resizeHasOccurred = resizeHasOccurredBackup;
             menuBarManager.updateAll(true);
         }
 
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/window/Window.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/window/Window.java
index ca019132a29..da9102a95a4 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/window/Window.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/window/Window.java
@@ -242,8 +242,9 @@ public abstract class Window implements IShellProvider {
 
 	/**
 	 * Internal fields to detect if shell size has been set
+	 * @since 3.9
 	 */
-	private boolean resizeHasOccurred = false;
+	protected boolean resizeHasOccurred = false;
 
 	private Listener resizeListener;