X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=d7b5eeabb772c2f0728cb4cc73120a6364350fa4;hb=072986ce1c5daf997b77db32b90635ac021bf117;hp=12f44ef146821fe0bbc962a90e55a8c0336952db;hpb=6930f50f8a5a8c2bc53bd948a2e32c7cd63fd02a;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
index 12f44ef..d7b5eea 100644
--- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
@@ -38,8 +38,8 @@ import net.pterodactylus.util.template.TemplateParser;
  */
 public class ImageLinkFilter implements Filter {
 
-	/** The template to render for the <img%gt; tag. */
-	private static final Template linkTemplate = TemplateParser.parse(new StringReader("<img<%ifnull !class> class=\"<%class|css>\"<%/if> src=\"<%src|html>\" alt=\"<%alt|html>\" title=\"<%title|html>\" width=\"<%width|html>\" height=\"<%height|html>\" />"));
+	/** The template to render for the &lt;img&gt; tag. */
+	private static final Template linkTemplate = TemplateParser.parse(new StringReader("<img<%ifnull !class> class=\"<%class|css>\"<%/if> src=\"<%src|html><%if forceDownload>?forcedownload=true<%/if>\" alt=\"<%alt|html>\" title=\"<%title|html>\" width=\"<%width|html>\" height=\"<%height|html>\" style=\"position: relative;<%ifnull ! top>top: <% top|html>;<%/if><%ifnull ! left>left: <% left|html>;<%/if>\"/>"));
 
 	/** The template context factory. */
 	private final TemplateContextFactory templateContextFactory;
@@ -63,6 +63,7 @@ public class ImageLinkFilter implements Filter {
 		String imageClass = parameters.get("class");
 		int maxWidth = Numbers.safeParseInteger(parameters.get("max-width"), Integer.MAX_VALUE);
 		int maxHeight = Numbers.safeParseInteger(parameters.get("max-height"), Integer.MAX_VALUE);
+		String mode = String.valueOf(parameters.get("mode"));
 		String title = parameters.get("title");
 		if ((title != null) && title.startsWith("=")) {
 			title = String.valueOf(templateContext.get(title.substring(1)));
@@ -72,17 +73,26 @@ public class ImageLinkFilter implements Filter {
 		linkTemplateContext.set("class", imageClass);
 		if (image.isInserted()) {
 			linkTemplateContext.set("src", "/" + image.getKey());
+			linkTemplateContext.set("forceDownload", true);
 		} else {
 			linkTemplateContext.set("src", "getImage.html?image=" + image.getId());
 		}
 		int imageWidth = image.getWidth();
 		int imageHeight = image.getHeight();
-		double scale = 1;
-		if ((imageWidth > maxWidth) || (imageHeight > maxHeight)) {
-			scale = Math.min(maxWidth / (double) imageWidth, maxHeight / (double) imageHeight);
+		if ("enlarge".equals(mode)) {
+			double scale = Math.max(maxWidth / (double) imageWidth, maxHeight / (double) imageHeight);
+			linkTemplateContext.set("width", (int) (imageWidth * scale + 0.5));
+			linkTemplateContext.set("height", (int) (imageHeight * scale + 0.5));
+			linkTemplateContext.set("left", String.format("%dpx", (int) (maxWidth - (imageWidth * scale)) / 2));
+			linkTemplateContext.set("top", String.format("%dpx", (int) (maxHeight - (imageHeight * scale)) / 2));
+		} else {
+			double scale = 1;
+			if ((imageWidth > maxWidth) || (imageHeight > maxHeight)) {
+				scale = Math.min(maxWidth / (double) imageWidth, maxHeight / (double) imageHeight);
+			}
+			linkTemplateContext.set("width", (int) (imageWidth * scale + 0.5));
+			linkTemplateContext.set("height", (int) (imageHeight * scale + 0.5));
 		}
-		linkTemplateContext.set("width", (int) (imageWidth * scale + 0.5));
-		linkTemplateContext.set("height", (int) (imageHeight * scale + 0.5));
 		linkTemplateContext.set("alt", Default.forNull(title, image.getDescription()));
 		linkTemplateContext.set("title", Default.forNull(title, image.getTitle()));