Combine multiple grayscale highlights

This commit is contained in:
Jan Klass 2025-07-16 18:05:00 +02:00
commit c4a5316974
2 changed files with 29 additions and 1 deletions

View file

@ -410,7 +410,9 @@ namespace Greenshot.Editor.Drawing
{ {
if (clipRectangle.Width != 0 && clipRectangle.Height != 0) if (clipRectangle.Width != 0 && clipRectangle.Height != 0)
{ {
foreach (IFilter filter in Filters) // GrayscaleFilter is an inverted filter. Combining two makes the entire image greyscale.
// Skip any GrayscaleFilter here so outer drawing logic can handle them to combine multiple
foreach (IFilter filter in Filters.Where(x => x is not GrayscaleFilter))
{ {
if (filter.Invert) if (filter.Invert)
{ {

View file

@ -331,6 +331,8 @@ namespace Greenshot.Editor.Drawing
var drawableContainers = this.Cast<DrawableContainer>(); var drawableContainers = this.Cast<DrawableContainer>();
ApplyGrayscaleFilters(g, drawableContainers, bitmap);
foreach (var dc in drawableContainers) foreach (var dc in drawableContainers)
{ {
if (dc.Parent == null) if (dc.Parent == null)
@ -343,6 +345,30 @@ namespace Greenshot.Editor.Drawing
dc.DrawContent(g, bitmap, renderMode, clipRectangle); dc.DrawContent(g, bitmap, renderMode, clipRectangle);
} }
} }
// To support multiple grayscale filters we merge them before applying them
static void ApplyGrayscaleFilters(Graphics g, IEnumerable<DrawableContainer> drawableContainers, Bitmap bitmap)
{
if (bitmap is null) return;
var grayFilters = drawableContainers.SelectMany(x => x.Filters.Where(filter => filter is GrayscaleFilter).Cast<GrayscaleFilter>());
// These rects shall not be grayed out
var rects = grayFilters.Select(x => x.Parent.Bounds);
// full bitmap size because the GrayscaleFilter is an inverted filter covering the full bitmap
var applyRect = new NativeRect(0, 0, bitmap.Width, bitmap.Height);
GraphicsState state = g.Save();
// Set a clipping region and then exclude the highlight areas so only "everything else" gets greyed out
g.SetClip(applyRect);
foreach (var rect in rects)
{
g.ExcludeClip(rect);
}
GrayscaleFilter.DrawGray(g, bitmap, applyRect);
g.Restore(state);
}
} }
/// <summary> /// <summary>