From 60920f045af73b7f375ab40c609f7fbe070b9c95 Mon Sep 17 00:00:00 2001 From: jprocter Date: Mon, 1 Oct 2012 17:13:35 +0100 Subject: [PATCH] JAL-1130 JAL-1139 hardcode preferred height to logo image height --- src/jalview/gui/SplashScreen.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 7f55f8b..3120388 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -123,13 +123,13 @@ public class SplashScreen extends JPanel implements Runnable, HyperlinkListener iframe.setContentPane(this); iframe.setLayer(JLayeredPane.PALETTE_LAYER); - Desktop.desktop.add(iframe); SplashImage splashimg = new SplashImage(image); iconimg.add(splashimg, BorderLayout.CENTER); add(iconimg, BorderLayout.NORTH); add(authlist, BorderLayout.CENTER); authlist.setEditable(false); authlist.addMouseListener(closer); + Desktop.desktop.add(iframe); refreshText(); } @@ -232,7 +232,12 @@ public class SplashScreen extends JPanel implements Runnable, HyperlinkListener setPreferredSize(new Dimension(image.getWidth(this) + 8, image.getHeight(this))); } - + @Override + public Dimension getPreferredSize() + { + return new Dimension(image.getWidth(this) + 8, + image.getHeight(this)); + } public void paintComponent(Graphics g) { g.setColor(Color.white); -- 1.7.10.2