From c05cc0b6955e1000dd89e06eb4d9fff3e7d21d06 Mon Sep 17 00:00:00 2001 From: kappa1 Date: Sun, 25 Jul 2010 13:31:49 +0000 Subject: [PATCH] AppletLoader: addded ability to use appletloader with no images, just the logo, just the progressbar or both. To set no image for either image you must set the parameter value to "". Both images are now centred independently allowing variable size logo and progressbar images. Resized appletprogress.gif to match appletlogo.png size. --- res/appletprogress.gif | Bin 8872 -> 7468 bytes .../org/lwjgl/util/applet/AppletLoader.java | 44 +++++++++++------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/res/appletprogress.gif b/res/appletprogress.gif index 709157cf196d3fb7018fdc8881c5e0651c8ec949..3ed42c66b00208982665467b6ee778360091e078 100644 GIT binary patch literal 7468 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

>0$&c=XxhAQ-Gq07U57j~4 z)$*}zq`!9Z^Vsar6moQ6Zu-;W@JfHT&HDDj#M1nl#4>`0h8-M%=#W^X65xR0gz8d?F+MC*zp3`ZsHUt3YGSk5 zAHgUzSz=piYYJGw6M~T3^-ia4bl4`rt9&A1CrCnrub6ocwP>YzyL;U+rd0gEghYV+ z@^d^E0laIQGmwpqbxP7(c9B&j`H2|g$89qrf2-vfkwqlG>CR#CG zFzb@#-xM_p;=tC&5%A&Al~7vgtp)chw$L6`{6vji literal 8872 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 NbJL`aG#47s`7gC~db9ul diff --git a/src/java/org/lwjgl/util/applet/AppletLoader.java b/src/java/org/lwjgl/util/applet/AppletLoader.java index e020ec37..54a36b86 100644 --- a/src/java/org/lwjgl/util/applet/AppletLoader.java +++ b/src/java/org/lwjgl/util/applet/AppletLoader.java @@ -283,13 +283,12 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { setBackground(bgColor); fgColor = getColor("boxfgcolor", Color.black); - // load logos - logo = getImage(getParameter("al_logo")); - progressbar = getImage(getParameter("al_progressbar")); - - //sanity check - if(logo == null || progressbar == null) { - fatalErrorOccured("Unable to load logo and progressbar images", null); + // load logos, if value is "" then skip + if (!getParameter("al_logo").equals("")) { + logo = getImage(getParameter("al_logo")); + } + if (!getParameter("al_progressbar").equals("")) { + progressbar = getImage(getParameter("al_progressbar")); } // check for lzma support @@ -460,21 +459,26 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { painting = true; - // get logo position so its in the middle of applet - int x = 0, y = 0; + // get position at the middle of the offscreen buffer + int x = offscreen.getWidth(null)/2; + int y = offscreen.getHeight(null)/2; - if(logo != null) { + /*if(logo != null) { x = (offscreen.getWidth(null) - logo.getWidth(null)) / 2; y = (offscreen.getHeight(null) - logo.getHeight(null)) / 2; - } + }*/ // draw logo - if (logo != null) og.drawImage(logoBuffer, x, y, this); + if (logo != null) { + og.drawImage(logoBuffer, x-logo.getWidth(null)/2, y-logo.getHeight(null)/2, this); + } // draw message int messageX = (offscreen.getWidth(null) - fm.stringWidth(message)) / 2; int messageY = y + 20; - if (logo != null) messageY += logoBuffer.getHeight(null); + + if (logo != null) messageY += logo.getHeight(null)/2; + else if (progressbar != null) messageY += progressbar.getHeight(null)/2; og.drawString(message, messageX, messageY); @@ -486,9 +490,9 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { // draw loading bar, clipping it depending on percentage done if (progressbar != null) { - int barSize = (progressbarBuffer.getWidth(null) * percentage) / 100; - og.clipRect(0, 0, x + barSize, offscreen.getHeight(null)); - og.drawImage(progressbarBuffer, x, y, this); + int barSize = (progressbar.getWidth(null) * percentage) / 100; + og.clipRect(x-progressbar.getWidth(null)/2, 0, barSize, offscreen.getHeight(null)); + og.drawImage(progressbarBuffer, x-progressbar.getWidth(null)/2, y-progressbar.getHeight(null)/2, this); } painting = false; @@ -527,7 +531,10 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { g.fillRect(0, 0, buffer.getWidth(null), buffer.getHeight(null)); // buffer background is cleared, so draw logo under progressbar - if (img == progressbar && logo != null) g.drawImage(logoBuffer, 0, 0, null); + if (img == progressbar && logo != null) { + g.drawImage(logoBuffer, progressbar.getWidth(null)/2-logo.getWidth(null)/2, + progressbar.getHeight(null)/2-logo.getHeight(null)/2, null); + } g.drawImage(img, 0, 0, this); g.dispose(); @@ -1453,6 +1460,9 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { } catch (Exception e) { /* */ } + + // show error as image could not be loaded + fatalErrorOccured("Unable to load logo and progressbar images", null); return null; }