Merge pull request #249 from OzanKurt/main

Ability to resize canvas when keeping fill background a certain color
spatie · May 17, 2024 · 392385f · 392385f
2 parents b323c78 + 3191236
commit 392385f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/src/Drivers/Gd/GdDriver.php b/src/Drivers/Gd/GdDriver.php
@@ -225,7 +225,13 @@ public function getSize(): Size
         return new Size($this->getWidth(), $this->getHeight());
     }
 
-    public function fit(Fit $fit, ?int $desiredWidth = null, ?int $desiredHeight = null): static
+    public function fit(
+        Fit $fit,
+        ?int $desiredWidth = null,
+        ?int $desiredHeight = null,
+        bool $relative = false,
+        string $backgroundColor = '#ffffff'
+    ): static
     {
         if ($fit === Fit::Crop) {
             return $this->fitCrop($fit, $this->getWidth(), $this->getHeight(), $desiredWidth, $desiredHeight);
@@ -248,7 +254,7 @@ public function fit(Fit $fit, ?int $desiredWidth = null, ?int $desiredHeight = n
         );
 
         if ($fit->shouldResizeCanvas()) {
-            $this->resizeCanvas($desiredWidth, $desiredHeight, AlignPosition::Center);
+            $this->resizeCanvas($desiredWidth, $desiredHeight, AlignPosition::Center, $relative, $backgroundColor);
         }
 
         return $this;

diff --git a/src/Drivers/ImageDriver.php b/src/Drivers/ImageDriver.php
@@ -52,7 +52,13 @@ public function sharpen(float $amount): static;
 
     public function getSize(): Size;
 
-    public function fit(Fit $fit, ?int $desiredWidth = null, ?int $desiredHeight = null): static;
+    public function fit(
+        Fit $fit, 
+        ?int $desiredWidth = null, 
+        ?int $desiredHeight = null,
+        bool $relative = false,
+        string $backgroundColor = '#ffffff'
+    ): static;
 
     public function pickColor(int $x, int $y, ColorFormat $colorFormat): mixed;
 

diff --git a/src/Drivers/Imagick/ImagickDriver.php b/src/Drivers/Imagick/ImagickDriver.php
@@ -120,7 +120,13 @@ public function blur(int $blur): static
         return $this;
     }
 
-    public function fit(Fit $fit, ?int $desiredWidth = null, ?int $desiredHeight = null): static
+    public function fit(
+        Fit $fit, 
+        ?int $desiredWidth = null, 
+        ?int $desiredHeight = null,
+        bool $relative = false,
+        string $backgroundColor = null,
+    ): static
     {
         if ($fit === Fit::Crop) {
             return $this->fitCrop($fit, $this->getWidth(), $this->getHeight(), $desiredWidth, $desiredHeight);
@@ -138,7 +144,7 @@ public function fit(Fit $fit, ?int $desiredWidth = null, ?int $desiredHeight = n
         }
 
         if ($fit->shouldResizeCanvas()) {
-            $this->resizeCanvas($desiredWidth, $desiredHeight, AlignPosition::Center, false, null);
+            $this->resizeCanvas($desiredWidth, $desiredHeight, AlignPosition::Center, $relative, $backgroundColor);
         }
 
         return $this;

diff --git a/src/Image.php b/src/Image.php
@@ -173,9 +173,15 @@ public function getSize(): Size
         return $this->imageDriver->getSize();
     }
 
-    public function fit(Fit $fit, ?int $desiredWidth = null, ?int $desiredHeight = null): static
-    {
-        $this->imageDriver->fit($fit, $desiredWidth, $desiredHeight);
+    public function fit(
+        Fit $fit,
+        ?int $desiredWidth = null,
+        ?int $desiredHeight = null,
+        bool $relative = false,
+        string $backgroundColor = '#ffffff'
+    ): static
+    {
+        $this->imageDriver->fit($fit, $desiredWidth, $desiredHeight, $relative, $backgroundColor);
 
         return $this;
     }