From 187ae47c40b9d90062dd4eb4253241fb952af4d2 Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 25 Apr 2023 20:42:15 +0300 Subject: [PATCH] Save image beautifier options --- ShareX.MediaLib/Forms/ImageBeautifierForm.cs | 6 +++--- ShareX/TaskHelpers.cs | 5 +++-- ShareX/TaskSettings.cs | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ShareX.MediaLib/Forms/ImageBeautifierForm.cs b/ShareX.MediaLib/Forms/ImageBeautifierForm.cs index ed1209e46..98c58a79d 100644 --- a/ShareX.MediaLib/Forms/ImageBeautifierForm.cs +++ b/ShareX.MediaLib/Forms/ImageBeautifierForm.cs @@ -107,7 +107,7 @@ private async Task UpdatePreview() UpdateOptions(); - Bitmap resultImage = await RenderPreview(SourceImage, Options); + Bitmap resultImage = await RenderPreviewAsync(SourceImage, Options); PreviewImage?.Dispose(); PreviewImage = resultImage; pbPreview.LoadImage(PreviewImage); @@ -124,7 +124,7 @@ private async Task UpdatePreview() } } - private static async Task RenderPreview(Bitmap sourceImage, ImageBeautifierOptions options) + private static async Task RenderPreviewAsync(Bitmap sourceImage, ImageBeautifierOptions options) { return await Task.Run(() => { @@ -159,7 +159,7 @@ private static async Task RenderPreview(Bitmap sourceImage, ImageBeautif resultImage = ImageHelpers.AddShadow(resultImage, 1f, options.ShadowSize, 0f, Color.Black, new Point(0, 0), false); } - if (options.Background != null) + if (options.Background != null && options.Background.IsValid) { Bitmap resultImageNew = ImageHelpers.FillBackground(resultImage, options.Background); resultImage.Dispose(); diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 3b91de71a..7aed050b2 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -1069,7 +1069,7 @@ public static void OpenImageBeautifier(TaskSettings taskSettings = null) { string filePath = ImageHelpers.OpenImageFileDialog(); - OpenImageBeautifier(filePath); + OpenImageBeautifier(filePath, taskSettings); } public static void OpenImageBeautifier(string filePath, TaskSettings taskSettings = null) @@ -1078,7 +1078,7 @@ public static void OpenImageBeautifier(string filePath, TaskSettings taskSetting { if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); - ImageBeautifierForm imageBeautifierForm = new ImageBeautifierForm(filePath, new ImageBeautifierOptions()); + ImageBeautifierForm imageBeautifierForm = new ImageBeautifierForm(filePath, taskSettings.ToolsSettingsReference.ImageBeautifierOptions); imageBeautifierForm.UploadImageRequested += output => { @@ -1100,6 +1100,7 @@ public static void OpenImageBeautifier(string filePath, TaskSettings taskSetting public static void OpenImageEffects(TaskSettings taskSettings = null) { string filePath = ImageHelpers.OpenImageFileDialog(); + OpenImageEffects(filePath, taskSettings); } diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 97224726a..f133981d7 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -416,6 +416,7 @@ public class TaskSettingsTools public string ScreenColorPickerFormatCtrl = "$r255, $g255, $b255"; public string ScreenColorPickerInfoText = "RGB: $r255, $g255, $b255$nHex: $hex$nX: $x Y: $y"; public IndexerSettings IndexerSettings = new IndexerSettings(); + public ImageBeautifierOptions ImageBeautifierOptions = new ImageBeautifierOptions(); public ImageCombinerOptions ImageCombinerOptions = new ImageCombinerOptions(); public VideoConverterOptions VideoConverterOptions = new VideoConverterOptions(); public VideoThumbnailOptions VideoThumbnailOptions = new VideoThumbnailOptions();