github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

MageFrame changed logic the handle the activeFrame.

Browse source
This commit is contained in:
LevelX2 2014-02-06 15:22:21 +01:00
parent d6789fa383
commit 2427b714a1
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -526,6 +526,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
public static void setActive(MagePane frame) {
if (frame == null) {
activeFrame = null;
return;
}
logger.debug("Setting " + frame.getTitle() + " active");
@ -552,11 +553,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
public static void deactivate(MagePane frame) {
frame.setVisible(false);
MagePane topmost = getTopMost(frame);
setActive(getTopMost(frame));
if (activeFrame != frame) {
frame.deactivated();
}
setActive(topmost);
}
private static MagePane getTopMost(MagePane exclude) {
@ -568,7 +569,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
if (z < best) {
if (frame instanceof MagePane) {
best = z;
topmost = (MagePane) frame;
if (!frame.equals(exclude)) {
topmost = (MagePane) frame;
}
}
}
}