From ca359a6ec2973113feb968fd6f9cea1f147b5e3e Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 23 May 2020 16:46:49 -0300
Subject: [PATCH] tweak acrylic

---
 samples/ControlCatalog/MainWindow.xaml       | 13 +++++++------
 src/Avalonia.Visuals/Media/IGradientBrush.cs |  1 +
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 13 ++++++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 01a9e940b6..a5094b997f 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -13,13 +13,14 @@
         x:Name="MainWindow"
         
         x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}" Background="{x:Null}">
-  <Panel DockPanel.Dock="Left" Width="400" Height="400" Background="Green">
+  <Panel DockPanel.Dock="Left" Width="400" Height="400" Background="Red">
 
     <Button Content="{Binding Test}" Background="Red" FontSize="55" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    <Panel>
-      <Panel.Background>
-        <AcrylicBrush TintColor="Black" BackgroundSource="BackDrop" TintOpacity="0.0" TintLuminosityOpacity="0.4" />
-      </Panel.Background>
-    </Panel>
+    <Border CornerRadius="30">
+      <Border.Background>
+        
+        <AcrylicBrush TintColor="#222222" BackgroundSource="None" TintOpacity="1" TintLuminosityOpacity="1" />
+      </Border.Background>
+    </Border>
   </Panel>
 </Window>
diff --git a/src/Avalonia.Visuals/Media/IGradientBrush.cs b/src/Avalonia.Visuals/Media/IGradientBrush.cs
index 488189d3be..5b1e883e7d 100644
--- a/src/Avalonia.Visuals/Media/IGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/IGradientBrush.cs
@@ -4,6 +4,7 @@ namespace Avalonia.Media
 {
     public enum AcrylicBackgroundSource
     {
+        None,
         HostBackDrop,
         BackDrop
     }
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 3672975384..746fe895a8 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -283,6 +283,10 @@ namespace Avalonia.Skia
                     }
                     Canvas.Clear();
                     Canvas.Restore();
+                }
+                else if(acrylicBrush.BackgroundSource == AcrylicBackgroundSource.None)
+                {
+
                 }
                 else
                 {
@@ -798,7 +802,7 @@ namespace Avalonia.Skia
             if (brush is IAcrylicBrush acrylicBrush)
             {
                 var tintOpacity = acrylicBrush.TintOpacity;
-                var noiseOpcity = 0.08;
+                var noiseOpcity = 0.045;
 
                 var excl = new SKColor(255, 255, 255, (byte)(255 * acrylicBrush.TintLuminosityOpacity));
                 var tint = new SKColor(acrylicBrush.TintColor.R, acrylicBrush.TintColor.G, acrylicBrush.TintColor.B, (byte)(255 * tintOpacity));
@@ -808,13 +812,16 @@ namespace Avalonia.Skia
                 var tintShader = SKShader.CreateColor(tint);
                 var noiseShader =
                     //SKShader.CreatePerlinNoiseImprovedNoise(0.5f, 0.5f, 4, 0)
-                    SKShader.CreatePerlinNoiseImprovedNoise(1.8f, 1.8f, 2, 0.76829314f)
+                    SKShader.CreatePerlinNoiseTurbulence(12.876f, 12.876f, 2, 0.76829314f)
                     .WithColorFilter(CreateAlphaColorFilter(noiseOpcity));
 
                 var compose = SKShader.CreateCompose(tintShader, noiseShader);
                 paint.Shader = compose;
 
-                paint.ImageFilter = SKImageFilter.CreateBlur(2.4f, 2.4f);
+                if (acrylicBrush.BackgroundSource == AcrylicBackgroundSource.BackDrop)
+                {
+                    paint.ImageFilter = SKImageFilter.CreateBlur(2.4f, 2.4f);
+                }
 
                 return paintWrapper;
             }