diff --git a/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs b/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs index 0a6bf748d..b43acd8d6 100644 --- a/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs +++ b/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs @@ -108,11 +108,6 @@ public static bool CopyImage(Image img) { try { - if (HelpersOptions.UseAlternativeCopyImage) - { - return CopyImageAlternative(img); - } - if (HelpersOptions.DefaultCopyImageFillBackground) { return CopyImageDefaultFillBackground(img, Color.White); @@ -245,11 +240,6 @@ public static Image GetImage() { lock (ClipboardLock) { - if (HelpersOptions.UseAlternativeGetImage) - { - return GetImageAlternative(); - } - return Clipboard.GetImage(); } } diff --git a/ShareX.HelpersLib/HelpersOptions.cs b/ShareX.HelpersLib/HelpersOptions.cs index 80187e279..fcbb1f584 100644 --- a/ShareX.HelpersLib/HelpersOptions.cs +++ b/ShareX.HelpersLib/HelpersOptions.cs @@ -35,8 +35,6 @@ public static class HelpersOptions public static ProxyInfo CurrentProxy { get; set; } = new ProxyInfo(); public static bool AcceptInvalidSSLCertificates { get; set; } = false; public static bool DefaultCopyImageFillBackground { get; set; } = true; - public static bool UseAlternativeCopyImage { get; set; } = true; - public static bool UseAlternativeGetImage { get; set; } = true; public static bool RotateImageByExifOrientationData { get; set; } = true; public static string BrowserPath { get; set; } = ""; public static List RecentColors { get; set; } = new List(); diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs index 01e084aa8..09d585d5b 100644 --- a/ShareX/ApplicationConfig.cs +++ b/ShareX/ApplicationConfig.cs @@ -201,12 +201,6 @@ public int HotkeyRepeatLimit [Category("Clipboard"), DefaultValue(true), Description("Show clipboard content viewer when using clipboard upload in main window.")] public bool ShowClipboardContentViewer { get; set; } - [Category("Clipboard"), DefaultValue(true), Description("Default .NET method can't copy image with alpha channel to clipboard. Alternatively, when this setting is false, ShareX copies \"PNG\" and 32 bit \"DIB\" to clipboard in order to retain image transparency. If you are experiencing issues then set this setting to true to use the default .NET method.")] - public bool UseDefaultClipboardCopyImage { get; set; } - - [Category("Clipboard"), DefaultValue(true), Description("Default .NET method can't get image with alpha channel from clipboard. Alternatively, when this setting is false, ShareX checks if clipboard contains \"PNG\" or 32 bit \"DIB\" in order to retain image transparency. If you are experiencing issues then set this setting to true to use the default .NET method.")] - public bool UseDefaultClipboardGetImage { get; set; } - [Category("Clipboard"), DefaultValue(true), Description("Because default .NET image copying not supports alpha channel, background of image will be black. This option will fill background white.")] public bool DefaultClipboardCopyImageFillBackground { get; set; } diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index c66f3d4c7..4c0862c1d 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -753,8 +753,6 @@ private void AfterApplicationSettingsJobs() HotkeyRepeatLimit = Program.Settings.HotkeyRepeatLimit; HelpersOptions.CurrentProxy = Program.Settings.ProxySettings; HelpersOptions.AcceptInvalidSSLCertificates = Program.Settings.AcceptInvalidSSLCertificates; - HelpersOptions.UseAlternativeCopyImage = !Program.Settings.UseDefaultClipboardCopyImage; - HelpersOptions.UseAlternativeGetImage = !Program.Settings.UseDefaultClipboardGetImage; HelpersOptions.DefaultCopyImageFillBackground = Program.Settings.DefaultClipboardCopyImageFillBackground; HelpersOptions.RotateImageByExifOrientationData = Program.Settings.RotateImageByExifOrientationData; HelpersOptions.BrowserPath = Program.Settings.BrowserPath;