Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2015-01-20 08:17:25 +0000
committerTom Schindl2015-01-20 08:17:25 +0000
commit372d25a64383e208f3ef4b12782b0ee9b37735af (patch)
tree753903bcfd4fed0b26fcd6cdb345b4368e65fb9b
parentb1705fbdbde18c4c37aa32428fc2546dc75090c1 (diff)
downloadorg.eclipse.efxclipse-372d25a64383e208f3ef4b12782b0ee9b37735af.tar.gz
org.eclipse.efxclipse-372d25a64383e208f3ef4b12782b0ee9b37735af.tar.xz
org.eclipse.efxclipse-372d25a64383e208f3ef4b12782b0ee9b37735af.zip
Bug 457900 - BasePerspectiveStackRenderer needs to clear
MUIElement#setCurSharedRef when hiding recursively
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java3
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java1
2 files changed, 3 insertions, 1 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java
index 83da6961c..63e0ebf55 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java
@@ -45,7 +45,7 @@ import org.osgi.service.event.EventHandler;
/**
* Base renderer of {@link MPerspectiveStack}
- *
+ *
* @param <N>
* the native widget type
* @param <I>
@@ -368,6 +368,7 @@ public abstract class BasePerspectiveStackRenderer<N, I, IC> extends BaseRendere
if (element instanceof MPlaceholder) {
MPlaceholder ph = (MPlaceholder) element;
element = ph.getRef();
+ element.setCurSharedRef(null);
}
// Hide any floating windows
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java
index 0538370a9..e12e7b748 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java
@@ -164,6 +164,7 @@ public abstract class BasePlaceholderRenderer<N> extends BaseRenderer<MPlacehold
thePart.setIconURI(null);
thePart.setIconURI(imageURI);
}
+ refElement.setCurSharedRef(null);
getPresentationEngine().removeGui(refElement);
} else {
IEclipseContext curContext = this.modelService.getContainingContext(element);

Back to the top