X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=1b85dd5c0261dd949faddd021b782f2a60f19713;hb=51b0b157926ed477cb558ca5971126bf9fccbd31;hp=59541bb1f66e5562e81919850a25452778ab790c;hpb=2e10281fc7181b019c7885a516cc743574403a43;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 59541bb..1b85dd5 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -204,6 +204,16 @@ public class Desktop extends jalview.jbgui.GDesktop /** Singleton Desktop instance */ public static Desktop instance; + /** + * BH TEMPORARY ONLY -- should use ApplicationSingleton + * + * @return + */ + public static Desktop getInstance() + { + return instance; + } + public static MyDesktopPane desktop; public static MyDesktopPane getDesktop() @@ -871,8 +881,8 @@ public class Desktop extends jalview.jbgui.GDesktop frame.setMaximizable(resizable); frame.setIconifiable(resizable); frame.setOpaque(Platform.isJS()); - - if (frame.getX() < 1 && frame.getY() < 1) + boolean isEmbedded = (Platform.getDimIfEmbedded(frame, -1, -1) != null); + if (!isEmbedded && frame.getX() < 1 && frame.getY() < 1) { frame.setLocation(xOffset * openFrameCount, yOffset * ((openFrameCount - 1) % 10) + yOffset); @@ -3364,4 +3374,5 @@ public class Desktop extends jalview.jbgui.GDesktop } return result; } + }