ACP2E-1239: Shifting of the PDP main image

 - Fixed the issue.

Author: devarul

app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php

@@ -105,6 +105,11 @@ public function getOptionsJson()
             $optionItems['thumbmargin'] = (int)$this->escapeHtml($this->getVar("gallery/thumbmargin"));
         }
 
+        if ($this->getVar("product_image_white_borders")) {
+            $optionItems['whiteBorders'] =
+                (int)$this->escapeHtml($this->getVar("product_image_white_borders"));
+        }
+
         return $this->jsonSerializer->serialize($optionItems);
     }
 
@@ -151,6 +156,11 @@ public function getFSOptionsJson()
                 (int)$this->escapeHtml($this->getVar("gallery/fullscreen/thumbmargin"));
         }
 
+        if ($this->getVar("product_image_white_borders")) {
+            $fsOptionItems['whiteBorders'] =
+                (int)$this->escapeHtml($this->getVar("product_image_white_borders"));
+        }
+
         return $this->jsonSerializer->serialize($fsOptionItems);
     }
 }

lib/web/mage/gallery/gallery.js

@@ -115,6 +115,8 @@ define([
             config.options.thumbwidth = _toNumber(config.options.thumbwidth);
             config.options.thumbheight = _toNumber(config.options.thumbheight);
 
+            config.options.whiteBorders = _toNumber(config.options.whiteBorders);
+
             config.options.swipe = true;
             this.config = config;
 
@@ -132,7 +134,10 @@ define([
                 data: _.clone(config.data)
             };
             config.options.ratio = config.options.width / config.options.height;
-            config.options.height = $(element).height();
+            config.options.height = null;
+            if (!config.options.whiteBorders) {
+                config.options.height = $(element).height();
+            }
 
             $.extend(true, this.startConfig, config);