valerie
/
ImgurScreensaver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loopy pages

master
marcus13345 2015-02-13 09:53:21 -05:00
parent f09b811baa
commit a072cdb3d8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ScrollingMain.java
View File

@ -61,10 +61,11 @@ public class ScrollingMain extends Canvas implements KeyListener, MouseMotionLis
final int pages = Integer.parseInt(new Variable("imgurscreensaver", "pages", "10", false).getValue()); final int pages = Integer.parseInt(new Variable("imgurscreensaver", "pages", "10", false).getValue());
loopPages(pages, new Variable("imgurscreensaver", "subreddit", "annakendrick", false).getValue()); int subreddits = Integer.parseInt(new Variable("imgurscreensaver", "subreddits", "1", false).getValue());
loopPages(pages, "emmawatson"); for(int i = 0; i < subreddits; i ++) {
loopPages(pages, "katyperry"); loopPages(pages, new Variable("imgurscreensaver", "subreddit-" + i, "annakendrick", false).getValue());
loopPages(pages, "selenagomez"); }
// loopPages(pages, "emmawatson"); // loopPages(pages, "emmawatson");
int elapsed = 0; int elapsed = 0;
@ -133,7 +134,7 @@ public class ScrollingMain extends Canvas implements KeyListener, MouseMotionLis
if (image.type.equals("image/gif")) if (image.type.equals("image/gif"))
imageCounter++; imageCounter++;
else if (!(image.nsfw && filterNSFW) && list.size() < 6) { else if (!(image.nsfw && filterNSFW) && list.size() < (3*images.size())) {
String url = "http://imgur.com/" + (image.id) + (parseExtension(image.type)); String url = "http://imgur.com/" + (image.id) + (parseExtension(image.type));
BufferedImage toAdd = convertImage(new ImageIcon(new URL(url)).getImage()); BufferedImage toAdd = convertImage(new ImageIcon(new URL(url)).getImage());
@ -253,7 +254,7 @@ public class ScrollingMain extends Canvas implements KeyListener, MouseMotionLis
g.drawImage(image, xPos, i * (getHeight() / images.size()), null); g.drawImage(image, xPos, i * (getHeight() / images.size()), null);
xPos += image.getWidth(); xPos += image.getWidth();
} }
timeThings.set(i, timeThings.get(i) + 10d); timeThings.set(i, timeThings.get(i) + 5d/images.size());
int firstWidth = list.get(0).getWidth(); int firstWidth = list.get(0).getWidth();
if (timeThings.get(i) > firstWidth) { if (timeThings.get(i) > firstWidth) {
timeThings.set(i, timeThings.get(i) - firstWidth); timeThings.set(i, timeThings.get(i) - firstWidth);