xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #5541 - Fix issues with hide/restore for dialogs during perspective switching." into omaha_16.2.1-lx

Browse source 
Former-commit-id: 904390e045f8c9b3c95fe4ed50d147e152e28962
This commit is contained in:
Ron Anderson 2016-04-21 12:49:02 -05:00 • committed by Gerrit Code Review
commit b501c05d55
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/AbstractMPEDialog.java
View file

@ -36,6 +36,7 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 28, 2010 mschenke Initial creation
* Apr 20, 2016 5541 dgilling Fix issues with hide/restore and perspective switching.
*
* </pre>
*
@ -86,8 +87,14 @@ public class AbstractMPEDialog extends Dialog implements
@Override
public final void hide() {
if (shell != null && shell.isDisposed() == false) {
wasVisible = shell.isVisible();
hide(false);
}
@Override
public final void hide(boolean isPerspectiveSwitch) {
Shell shell = getShell();
if ((shell != null) && (!shell.isDisposed())) {
wasVisible = shell.isVisible() && isPerspectiveSwitch;
lastLocation = shell.getLocation();
shell.setVisible(false);
}
@ -95,10 +102,17 @@ public class AbstractMPEDialog extends Dialog implements
@Override
public final void restore() {
if (shell != null && shell.isDisposed() == false) {
shell.setVisible(wasVisible);
shell.setLocation(lastLocation);
}
restore(false);
}
@Override
public final void restore(boolean isPerspectiveSwitch) {
Shell shell = getShell();
if ((shell != null) && (!shell.isDisposed())) {
if ((isPerspectiveSwitch && wasVisible) || (!isPerspectiveSwitch)) {
shell.setVisible(true);
shell.setLocation(lastLocation);
}
}
}
}