Merge "Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective." into omaha_13.5.1
Former-commit-id:b7b2602271
[formerlyb7b2602271
[formerly de43ca9364a34a3ace5ef41da75c5a295c805339]] Former-commit-id:ba5c49fa61
Former-commit-id:622e1298d2
This commit is contained in:
commit
65157cd1de
1 changed files with 8 additions and 5 deletions
|
@ -70,9 +70,11 @@ import com.raytheon.viz.ui.tools.ModalToolManager;
|
|||
* <pre>
|
||||
* SOFTWARE HISTORY
|
||||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Jul 22, 2008 randerso Initial creation
|
||||
* Mar 26, 2013 1799 bsteffen Fix pan/zoom when in views.
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Jul 22, 2008 randerso Initial creation
|
||||
* Mar 26, 2013 1799 bsteffen Fix pan/zoom when in views.
|
||||
* Jun 19, 2013 2116 bsteffen Do not deactivate contexts for parts
|
||||
* when closing an inactive perspective.
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
@ -512,8 +514,9 @@ public abstract class AbstractVizPerspectiveManager implements
|
|||
|
||||
protected void deactivateContexts(ContextManager manager) {
|
||||
manager.deactivateContexts(this);
|
||||
if (page != null && page.getActivePart() != null) {
|
||||
manager.deactivateContexts(page.getActivePart());
|
||||
if (page != null && page.getActivePart() != null
|
||||
&& perspectiveId.equals(page.getPerspective().getId())) {
|
||||
manager.deactivateContexts(page.getActivePart());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue