summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMichael Seele2013-02-11 13:08:54 (EST)
committer Paul Webster2013-02-11 13:08:54 (EST)
commitf5158dd77a576504dbf92e2c1f7884ce8d257991 (patch)
tree1ec8610a3f24ad0ac416a7ced2f3862174c25ff8
parentd25688f22ba718e95e63bbe6d7fe6614c1ec8abd (diff)
downloadeclipse.platform.ui-f5158dd77a576504dbf92e2c1f7884ce8d257991.zip
eclipse.platform.ui-f5158dd77a576504dbf92e2c1f7884ce8d257991.tar.gz
eclipse.platform.ui-f5158dd77a576504dbf92e2c1f7884ce8d257991.tar.bz2
Bug 289181 - [JFace] initial size & location of Window is never set if av20130211-180854
menu bar is displayed
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/window/ApplicationWindow.java2
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/window/Window.java3
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 5245b48..ce5ce50 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 ca01913..da9102a 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;