github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-12 08:07:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

This adds a workaround for #348, removing the usage of the DIB format and replace it with BITMAP. This might break transparency for some applications, but it's not used much in Windows 11 yet.

Browse source
This commit is contained in:
Robin Krom 2022-01-25 10:45:38 +01:00
parent fda0cd9555
commit 46a302f5e8
No known key found for this signature in database
GPG key ID: BCC01364F1371490
1 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/Greenshot.Base/Core/CoreConfiguration.cs
View file

@ -24,6 +24,7 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Windows.Forms; using System.Windows.Forms;
using Greenshot.Base.Core.Enums; using Greenshot.Base.Core.Enums;
@ -386,7 +387,7 @@ namespace Greenshot.Base.Core
/// <returns></returns> /// <returns></returns>
public bool IsExperimentalFeatureEnabled(string experimentalFeature) public bool IsExperimentalFeatureEnabled(string experimentalFeature)
{ {
return (ExperimentalFeatures != null && ExperimentalFeatures.Contains(experimentalFeature)); return ExperimentalFeatures != null && ExperimentalFeatures.Contains(experimentalFeature);
} }
/// <summary> /// <summary>
@ -398,17 +399,17 @@ namespace Greenshot.Base.Core
{ {
switch (property) switch (property)
{ {
case "PluginWhitelist": case nameof(ExcludePlugins):
case "PluginBacklist": case nameof(IncludePlugins):
return new List<string>(); return new List<string>();
case "OutputFileAsFullpath": case nameof(OutputFileAsFullpath):
if (IniConfig.IsPortable) if (IniConfig.IsPortable)
{ {
return Path.Combine(Application.StartupPath, @"..\..\Documents\Pictures\Greenshots\dummy.png"); return Path.Combine(Application.StartupPath, @"..\..\Documents\Pictures\Greenshots\dummy.png");
} }
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "dummy.png"); return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "dummy.png");
case "OutputFilePath": case nameof(OutputFilePath):
if (IniConfig.IsPortable) if (IniConfig.IsPortable)
{ {
string pafOutputFilePath = Path.Combine(Application.StartupPath, @"..\..\Documents\Pictures\Greenshots"); string pafOutputFilePath = Path.Combine(Application.StartupPath, @"..\..\Documents\Pictures\Greenshots");
@ -432,16 +433,16 @@ namespace Greenshot.Base.Core
} }
return Environment.GetFolderPath(Environment.SpecialFolder.Desktop); return Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
case "DWMBackgroundColor": case nameof(DWMBackgroundColor):
return Color.Transparent; return Color.Transparent;
case "ActiveTitleFixes": case nameof(ActiveTitleFixes):
return new List<string> return new List<string>
{ {
"Firefox", "Firefox",
"IE", "IE",
"Chrome" "Chrome"
}; };
case "TitleFixMatcher": case nameof(TitleFixMatcher):
return new Dictionary<string, string> return new Dictionary<string, string>
{ {
{ {
@ -454,7 +455,7 @@ namespace Greenshot.Base.Core
"Chrome", " - Google Chrome.*" "Chrome", " - Google Chrome.*"
} }
}; };
case "TitleFixReplacer": case nameof(TitleFixReplacer):
return new Dictionary<string, string> return new Dictionary<string, string>
{ {
{ {
@ -509,7 +510,7 @@ namespace Greenshot.Base.Core
try try
{ {
// Store version, this can be used later to fix settings after an update // Store version, this can be used later to fix settings after an update
LastSaveWithVersion = Assembly.GetEntryAssembly().GetName().Version.ToString(); LastSaveWithVersion = Assembly.GetEntryAssembly()?.GetName().Version.ToString();
} }
catch catch
{ {
@ -530,7 +531,7 @@ namespace Greenshot.Base.Core
try try
{ {
// Store version, this can be used later to fix settings after an update // Store version, this can be used later to fix settings after an update
LastSaveWithVersion = Assembly.GetEntryAssembly().GetName().Version.ToString(); LastSaveWithVersion = Assembly.GetEntryAssembly()?.GetName().Version.ToString();
} }
catch catch
{ {
@ -657,6 +658,16 @@ namespace Greenshot.Base.Core
{ {
WebRequestReadWriteTimeout = 100; WebRequestReadWriteTimeout = 100;
} }
// Workaround for the Windows 11 clipboard issue found here: https://github.com/greenshot/greenshot/issues/348
if (WindowsVersion.IsWindows11OrLater)
{
// If the format DIB is used, remove it and replace it with BITMAP.
if (ClipboardFormats.Contains(ClipboardFormat.DIB))
{
ClipboardFormats = ClipboardFormats.Where(cf => cf != ClipboardFormat.DIB).Append(ClipboardFormat.BITMAP).ToList();
}
}
} }
/// <summary> /// <summary>