From 29984b1d45684403723e790dce235fa0bb73c97a Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 30 May 2020 15:12:23 -0300 Subject: [PATCH] drop light mode inset shadow. --- src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 24 ++++---------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs index 0d628d6b21..307f01ad1a 100644 --- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs +++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs @@ -227,14 +227,6 @@ namespace Avalonia.Skia return bounds; } - private static bool IsLight (Color c) - { - double lightness = (0.299 * c.R + 0.587 * c.G + 0.114 * c.B) / 255; - - return lightness > 0.5; - } - - /// public void DrawRectangle(IBrush brush, IPen pen, RoundedRect rect, BoxShadows boxShadows = default) { @@ -245,17 +237,6 @@ namespace Avalonia.Skia if (rect.Rect.Height > 8192 || rect.Rect.Width > 8192) boxShadows = default; - if (brush is IExperimentalAcrylicBrush acrylic && IsLight(acrylic.TintColor)) - { - boxShadows = new BoxShadows(new BoxShadow - { - Blur = 2, - OffsetX = 1, - Color = Colors.White, - IsInset = true - }); - } - var rc = rect.Rect.ToSKRect(); var isRounded = rect.IsRounded; var needRoundRect = rect.IsRounded || (boxShadows.HasInsetShadows); @@ -726,7 +707,10 @@ namespace Avalonia.Skia if(brush is IExperimentalAcrylicBrush acrylicBrush) { - var tintOpacity = acrylicBrush.TintOpacity; + var tintOpacity = + acrylicBrush.BackgroundSource == AcrylicBackgroundSource.Digger ? + acrylicBrush.TintOpacity : 1; + var noiseOpcity = 0.12; var excl = new SKColor(255, 255, 255, (byte)(255 * acrylicBrush.TintLuminosityOpacity));