git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
ad80ca5
..
0ee6db7
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-360,7
+360,8
@@
public class Desktop extends jalview.jbgui.GDesktop
new MyDesktopManager(
(Platform.isWindows() ? new DefaultDesktopManager()
: Platform.isAMac()
new MyDesktopManager(
(Platform.isWindows() ? new DefaultDesktopManager()
: Platform.isAMac()
- ? new AquaInternalFrameManager()
+ ? new AquaInternalFrameManager(
+ desktop.getDesktopManager())
: desktop.getDesktopManager())));
Rectangle dims = getLastKnownDimensions("");
: desktop.getDesktopManager())));
Rectangle dims = getLastKnownDimensions("");
@@
-868,10
+869,15
@@
public class Desktop extends jalview.jbgui.GDesktop
JInternalFrame itf = desktop.getSelectedFrame();
if (itf != null)
{
JInternalFrame itf = desktop.getSelectedFrame();
if (itf != null)
{
+ if (itf instanceof AlignFrame)
+ {
+ Jalview.setCurrentAlignFrame((AlignFrame) itf);
+ }
itf.requestFocus();
}
}
itf.requestFocus();
}
}
+
@Override
public void internalFrameClosed(InternalFrameEvent evt)
{
@Override
public void internalFrameClosed(InternalFrameEvent evt)
{
@@
-894,15
+900,7
@@
public class Desktop extends jalview.jbgui.GDesktop
menuItem.removeActionListener(menuItem.getActionListeners()[0]);
}
windowMenu.remove(menuItem);
menuItem.removeActionListener(menuItem.getActionListeners()[0]);
}
windowMenu.remove(menuItem);
- JInternalFrame itf = desktop.getSelectedFrame();
- if (itf != null)
- {
- itf.requestFocus();
- if (itf instanceof AlignFrame)
- {
- Jalview.setCurrentAlignFrame((AlignFrame) itf);
- }
- }
+
System.gc();
};
});
System.gc();
};
});