diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index ed8b2e4a9..c32c07cfb 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -117,13 +117,13 @@ return [ 'picture_width' => [ 'type' => 'anomaly.field_type.integer', 'config' => [ - 'default_value' => 900, + 'default_value' => 600, ], ], 'picture_height' => [ 'type' => 'anomaly.field_type.integer', 'config' => [ - 'default_value' => 600, + 'default_value' => 400, ], ], 'watermark_type' => [ diff --git a/addons/default/visiosoft/media-field_type/resources/config/settings.php b/addons/default/visiosoft/media-field_type/resources/config/settings.php index ba8f5f0a8..d541497e1 100644 --- a/addons/default/visiosoft/media-field_type/resources/config/settings.php +++ b/addons/default/visiosoft/media-field_type/resources/config/settings.php @@ -14,13 +14,6 @@ return [ 'default_value' => 600, ], ], - - 'imageResizeW' => [ - 'type' => 'anomaly.field_type.integer', - 'config' => [ - 'default_value' => null, - ], - ], 'imageResizeH' => [ 'type' => 'anomaly.field_type.integer', 'config' => [ diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index 72a7f2239..fb95602b8 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -60,22 +60,23 @@ class UploadController extends AdminController $watermarktype = $settings->value('visiosoft.module.advs::watermark_type'); $position = $settings->value('visiosoft.module.advs::watermark_position'); $fullImg = WaterMark::make($this->request->file('upload')->getRealPath()) - ->resize( - setting_value('visiosoft.field_type.media::imageResizeW', null), - setting_value('visiosoft.field_type.media::imageResizeH', 600) - ) - ->resizeCanvas( - setting_value('visiosoft.field_type.media::imageCanvasW', 800), - setting_value('visiosoft.field_type.media::imageCanvasH', 600), - 'center', - false, - 'fff' - ); + ->resize(null, setting_value('visiosoft.field_type.media::imageResizeH', 600),function ($constraint) { + $constraint->aspectRatio(); + }) + ->resizeCanvas( + setting_value('visiosoft.field_type.media::imageCanvasW', 800), + setting_value('visiosoft.field_type.media::imageCanvasH', 600), + 'center', false, 'fff' + ); $mdImg = WaterMark::make($this->request->file('upload')->getRealPath()) - ->resize( - setting_value('visiosoft.module.advs::picture_width'), - setting_value('visiosoft.module.advs::picture_height') - ); + ->resize(null, setting_value('visiosoft.module.advs::picture_height'),function ($constraint) { + $constraint->aspectRatio(); + }) + ->resizeCanvas( + setting_value('visiosoft.module.advs::picture_width', 400), + setting_value('visiosoft.module.advs::picture_height', 300), + 'center', false, 'fff' + ); foreach ([$fullImg, $mdImg] as $index => $image) { if ($watermarktype == 'image') { $watermarkimage_id = $settings->value('visiosoft.module.advs::watermark_image');