X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=61273c74994e8ed3318effa0ece24c1b27989aef;hb=948828a5fed141e2ed319586687b80b6d0298268;hp=a8a849ef249b0cfc409cb5e8f8ade4af035e9175;hpb=04e2d97b71fad3d9d02abbe292ea1fa9ba6d1438;p=jalview.git
diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index a8a849e..61273c7 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -59,7 +59,8 @@ public class SplashScreen extends JPanel
private JPanel iconimg = new JPanel(new BorderLayout());
- // could change fg, bg, font later to use ChannelProperties
+ // could change fg, bg, font later to use ChannelProperties (these are not
+ // actually being used!)
private static Color bg = Color.WHITE;
private static Color fg = Color.BLACK;
@@ -237,8 +238,9 @@ public class SplashScreen extends JPanel
* SwingJS doesn't have HTMLEditorKit, required for a JTextPane
* to display formatted html, so we use a simple alternative
*/
- String text = "
![](\"swingjs/j2s/images/jalview_logo-48.png\"/)
"
- + newtext + "";
+ String text = "
" + newtext
+ + "
";
JLabel ta = new JLabel(text);
ta.setOpaque(true);
ta.setBackground(Color.white);
@@ -264,15 +266,19 @@ public class SplashScreen extends JPanel
splashText.addMouseListener(closer);
splashText.setVisible(true);
- splashText.setSize(new Dimension(750, 375 + logoSize));
+ splashText.setSize(new Dimension(750,
+ 425 + logoSize + (Platform.isJS() ? 40 : 0)));
splashText.setBackground(bg);
splashText.setForeground(fg);
splashText.setFont(font);
add(splashText, BorderLayout.CENTER);
revalidate();
- iframe.setBounds((Desktop.instance.getWidth() - 750) / 2,
- (Desktop.instance.getHeight() - 375) / 2, 750,
- splashText.getHeight() + iconimg.getHeight());
+ int width = Math.max(splashText.getWidth(), iconimg.getWidth());
+ int height = splashText.getHeight() + iconimg.getHeight();
+ iframe.setBounds(
+ Math.max(0, (Desktop.instance.getWidth() - width) / 2),
+ Math.max(0, (Desktop.instance.getHeight() - height) / 2),
+ width, height);
iframe.validate();
iframe.setVisible(true);
return true;