Fill cropped area with body's background color to have equally sized …

…screenshots
otto-de · May 23, 2024 · fb2baeb · fb2baeb
1 parent 45cd195
commit fb2baeb
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/core/src/main/java/de/otto/jlineup/browser/Browser.java b/core/src/main/java/de/otto/jlineup/browser/Browser.java
@@ -126,6 +126,7 @@ public static Type forValue(String value) {
     static final String JS_CHECK_FOR_ELEMENT_CALL = "return document.querySelector('%s') !== null;";
 
     static final String JS_GET_DEVICE_PIXEL_RATIO_CALL = "return window.devicePixelRatio;";
+    static final String JS_GET_BODY_COLOR_CALL = "return window.getComputedStyle(document.body).getPropertyValue('background-color').match(/\\d+/g);";
 
     private final JobConfig jobConfig;
     private final FileService fileService;
@@ -453,7 +454,14 @@ private void takeScreenshotsForContext(final ScreenshotContext screenshotContext
 
             if (yPosition + viewportHeight > pageHeight && GlobalOptions.getOption(GlobalOption.JLINEUP_CROP_LAST_SCREENSHOT).equalsIgnoreCase("true")) {
                 LOG.debug("Last screenshot. Will crop image. Page height: {}, yPosition: {}, viewportHeight: {}", pageHeight, yPosition, viewportHeight);
-                currentScreenshot = currentScreenshot.getSubimage(0, (int)((yPosition + viewportHeight - pageHeight) * getDevicePixelRatio()), currentScreenshot.getWidth(), (int)((pageHeight.intValue() - yPosition) * getDevicePixelRatio()));
+
+                BufferedImage croppedAndFilledScreenshot = new BufferedImage(currentScreenshot.getWidth(), currentScreenshot.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
+                Graphics2D g = croppedAndFilledScreenshot.createGraphics();
+                g.setColor(getBodyColor());
+                g.fillRect(0, 0, currentScreenshot.getWidth(), currentScreenshot.getHeight());
+                // Draw shifted image
+                g.drawImage(currentScreenshot, 0, -(int)((yPosition + viewportHeight - pageHeight) * getDevicePixelRatio()), null);
+                currentScreenshot = croppedAndFilledScreenshot;
             }
 
             fileService.writeScreenshot(screenshotContext,
@@ -687,6 +695,13 @@ private String getUserAgent() {
         return (String) jse.executeScript(JS_GET_USER_AGENT_CALL);
     }
 
+    private Color getBodyColor() {
+        LOG.debug("Getting body color.");
+        JavascriptExecutor jse = (JavascriptExecutor) getWebDriver();
+        List<String> bodyColor = (List<String>) jse.executeScript(JS_GET_BODY_COLOR_CALL);
+        return new Color(Integer.parseInt(bodyColor.get(0)), Integer.parseInt(bodyColor.get(1)), Integer.parseInt(bodyColor.get(2)));
+    }
+
     void scrollTo(int yPosition) throws InterruptedException {
         LOG.debug("Scroll to {}", yPosition);
         JavascriptExecutor jse = (JavascriptExecutor) getWebDriver();