Merge remote-tracking branch 'upstream/master' into consistent-LangVersion

4 years ago · db4546c4f5
46 changed files with 242 additions and 90 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -169,6 +169,8 @@ dotnet_diagnostic.CA1828.severity = warning
 dotnet_diagnostic.CA1829.severity = warning
 #CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters
 dotnet_diagnostic.CA1847.severity = warning
+#CACA2211:Non-constant fields should not be visible
+dotnet_diagnostic.CA2211.severity = error

 # Wrapping preferences
 csharp_wrap_before_ternary_opsigns = false
--- a/azure-pipelines-integrationtests.yml
+++ b/azure-pipelines-integrationtests.yml
@ -18,9 +18,9 @@ jobs:
      version: 6.0.404

  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100'
+    displayName: 'Use .NET Core SDK 7.0.101'
    inputs:
-      version: 7.0.100
+      version: 7.0.101
      
  - script: system_profiler SPDisplaysDataType |grep Resolution
  
@ -56,9 +56,9 @@ jobs:
      version: 6.0.404

  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100'
+    displayName: 'Use .NET Core SDK 7.0.101'
    inputs:
-      version: 7.0.100
+      version: 7.0.101

  - task: Windows Application Driver@0
    inputs:
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -35,9 +35,9 @@ jobs:
      version: 6.0.404

  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0'
+    displayName: 'Use .NET Core SDK 7.0.101'
    inputs:
-      version: 7.0.100
+      version: 7.0.101

  - task: CmdLine@2
    displayName: 'Install Workloads'
@ -72,9 +72,9 @@ jobs:
      version: 6.0.404

  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100'
+    displayName: 'Use .NET Core SDK 7.0.101'
    inputs:
-      version: 7.0.100
+      version: 7.0.101

  - task: CmdLine@2
    displayName: 'Install Workloads'
@ -143,9 +143,9 @@ jobs:
      version: 6.0.404

  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100'
+    displayName: 'Use .NET Core SDK 7.0.101'
    inputs:
-      version: 7.0.100
+      version: 7.0.101

  - task: CmdLine@2
    displayName: 'Install Workloads'
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
    "sdk": {
-        "version": "7.0.100",
+        "version": "7.0.101",
        "rollForward": "latestFeature"
    },
    "msbuild-sdks": {
--- a/samples/ControlCatalog.Android/MainActivity.cs
+++ b/samples/ControlCatalog.Android/MainActivity.cs
@ -5,7 +5,7 @@ using Avalonia.Android;

 namespace ControlCatalog.Android
 {
-    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
+    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.Main", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
    public class MainActivity : AvaloniaMainActivity
    {
    }
--- a/samples/ControlCatalog.Android/Resources/values/styles.xml
+++ b/samples/ControlCatalog.Android/Resources/values/styles.xml
@ -14,4 +14,8 @@
    <item name="android:windowContentOverlay">@null</item>
  </style>

+  <style name="MyTheme.Main" parent ="MyTheme.NoActionBar">
+    <item name="android:windowIsTranslucent">true</item>
+  </style>
+
 </resources>
--- a/samples/ControlCatalog.Android/SplashActivity.cs
+++ b/samples/ControlCatalog.Android/SplashActivity.cs
@ -28,6 +28,8 @@ namespace ControlCatalog.Android
            base.OnResume();

            StartActivity(new Intent(Application.Context, typeof(MainActivity)));
+
+            Finish();
        }
    }
 }
--- a/samples/ControlCatalog.Browser/Properties/launchSettings.json
+++ b/samples/ControlCatalog.Browser/Properties/launchSettings.json
@ -0,0 +1,13 @@
+{
+  "profiles": {
+    "ControlCatalog.Browser": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
+    }
+  }
+}
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@ -209,8 +209,7 @@
              </ComboBox.Items>
            </ComboBox>
            <ComboBox x:Name="TransparencyLevels"
-                      HorizontalAlignment="Stretch"
-                      SelectedIndex="{Binding TransparencyLevel}">
+                      HorizontalAlignment="Stretch">
              <ComboBox.Items>
                <WindowTransparencyLevel>None</WindowTransparencyLevel>
                <WindowTransparencyLevel>Transparent</WindowTransparencyLevel>
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@ -6,6 +6,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
+using Avalonia.VisualTree;
 using ControlCatalog.Models;
 using ControlCatalog.Pages;

@ -59,17 +60,25 @@ namespace ControlCatalog
            };

            var transparencyLevels = this.Get<ComboBox>("TransparencyLevels");
-            IDisposable? backgroundSetter = null, paneBackgroundSetter = null;
+            IDisposable? topLevelBackgroundSideSetter = null, sideBarBackgroundSetter = null, paneBackgroundSetter = null;
            transparencyLevels.SelectionChanged += (sender, e) =>
            {
-                backgroundSetter?.Dispose();
+                topLevelBackgroundSideSetter?.Dispose();
+                sideBarBackgroundSetter?.Dispose();
                paneBackgroundSetter?.Dispose();
-                if (transparencyLevels.SelectedItem is WindowTransparencyLevel selected
-                    && selected != WindowTransparencyLevel.None)
+                if (transparencyLevels.SelectedItem is WindowTransparencyLevel selected)
                {
-                    var semiTransparentBrush = new ImmutableSolidColorBrush(Colors.Gray, 0.5);
-                    backgroundSetter = sideBar.SetValue(BackgroundProperty, semiTransparentBrush, Avalonia.Data.BindingPriority.Style);
-                    paneBackgroundSetter = sideBar.SetValue(SplitView.PaneBackgroundProperty, semiTransparentBrush, Avalonia.Data.BindingPriority.Style);
+                    var topLevel = (TopLevel)this.GetVisualRoot()!;
+                    topLevel.TransparencyLevelHint = selected;
+
+                    if (selected != WindowTransparencyLevel.None)
+                    {
+                        var transparentBrush = new ImmutableSolidColorBrush(Colors.White, 0);
+                        var semiTransparentBrush = new ImmutableSolidColorBrush(Colors.Gray, 0.2);
+                        topLevelBackgroundSideSetter = topLevel.SetValue(BackgroundProperty, transparentBrush, Avalonia.Data.BindingPriority.Style);
+                        sideBarBackgroundSetter = sideBar.SetValue(BackgroundProperty, semiTransparentBrush, Avalonia.Data.BindingPriority.Style);
+                        paneBackgroundSetter = sideBar.SetValue(SplitView.PaneBackgroundProperty, semiTransparentBrush, Avalonia.Data.BindingPriority.Style);
+                    }
                }
            };
        }
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@ -10,7 +10,6 @@
        ExtendClientAreaToDecorationsHint="{Binding ExtendClientAreaEnabled}"
        ExtendClientAreaChromeHints="{Binding ChromeHints}"
        ExtendClientAreaTitleBarHeightHint="{Binding TitleBarHeight}"
-        TransparencyLevelHint="{Binding TransparencyLevel}"        
        x:Name="MainWindow"
        Background="Transparent"
        x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}"
--- a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
+++ b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
@ -11,12 +11,5 @@
    <CheckBox Content="Title Bar" IsChecked="{Binding SystemTitleBarEnabled}" />    
    <CheckBox Content="Prefer System Chrome" IsChecked="{Binding PreferSystemChromeEnabled}" />
    <Slider Minimum="-1" Maximum="200" Value="{Binding TitleBarHeight}" />
-    <ComboBox x:Name="TransparencyLevels" SelectedIndex="{Binding TransparencyLevel}">
-      <ComboBoxItem>None</ComboBoxItem>
-      <ComboBoxItem>Transparent</ComboBoxItem>
-      <ComboBoxItem>Blur</ComboBoxItem>
-      <ComboBoxItem>AcrylicBlur</ComboBoxItem>
-      <ComboBoxItem>Mica</ComboBoxItem>
-    </ComboBox>
  </StackPanel>
 </UserControl>
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@ -17,7 +17,6 @@ namespace ControlCatalog.ViewModels
        private bool _isMenuItemChecked = true;
        private WindowState _windowState;
        private WindowState[] _windowStates = Array.Empty<WindowState>();
-        private int _transparencyLevel;
        private ExtendClientAreaChromeHints _chromeHints = ExtendClientAreaChromeHints.PreferSystemChrome;
        private bool _extendClientAreaEnabled;
        private bool _systemTitleBarEnabled;
@ -77,12 +76,6 @@ namespace ControlCatalog.ViewModels
            TitleBarHeight = -1;
        }        

-        public int TransparencyLevel
-        {
-            get { return _transparencyLevel; }
-            set { this.RaiseAndSetIfChanged(ref _transparencyLevel, value); }
-        }        
-
        public ExtendClientAreaChromeHints ChromeHints
        {
            get { return _chromeHints; }
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@ -24,6 +24,8 @@ namespace Avalonia.Android

            _root = new EmbeddableControlRoot(_view);
            _root.Prepare();
+
+            this.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
        }

        internal TopLevelImpl TopLevelImpl => _view;
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@ -22,6 +22,7 @@ namespace Avalonia.Android
        public InvalidationAwareSurfaceView(Context context) : base(context)
        {
            Holder.AddCallback(this);
+            Holder.SetFormat(global::Android.Graphics.Format.Transparent);
            _handler = new Handler(context.MainLooper);
        }

--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@ -26,6 +26,7 @@ using Avalonia.Rendering.Composition;
 using Java.Lang;
 using Math = System.Math;
 using AndroidRect = Android.Graphics.Rect;
+using Android.Graphics.Drawables;

 namespace Avalonia.Android.Platform.SkiaPlatform
 {
@ -283,7 +284,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
        public Action LostFocus { get; set; }
        public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }

-        public WindowTransparencyLevel TransparencyLevel => WindowTransparencyLevel.None;
+        public WindowTransparencyLevel TransparencyLevel { get; private set; }

        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => new AcrylicPlatformCompensationLevels(1, 1, 1);

@ -301,7 +302,87 @@ namespace Avalonia.Android.Platform.SkiaPlatform

        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
        {
-            throw new NotImplementedException();
+            if (TransparencyLevel != transparencyLevel)
+            {
+                bool isBelowR = Build.VERSION.SdkInt < BuildVersionCodes.R;
+                bool isAboveR = Build.VERSION.SdkInt > BuildVersionCodes.R;
+                if (_view.Context is AvaloniaMainActivity activity)
+                {
+                    switch (transparencyLevel)
+                    {
+                        case WindowTransparencyLevel.AcrylicBlur:
+                        case WindowTransparencyLevel.ForceAcrylicBlur:
+                        case WindowTransparencyLevel.Mica:
+                        case WindowTransparencyLevel.None:
+                            if (!isBelowR)
+                            {
+                                activity.SetTranslucent(false);
+                            }
+                            if (isAboveR)
+                            {
+                                activity.Window?.ClearFlags(WindowManagerFlags.BlurBehind);
+
+                                var attr = activity.Window?.Attributes;
+                                if (attr != null)
+                                {
+                                    attr.BlurBehindRadius = 0;
+
+                                    activity.Window.Attributes = attr;
+                                }
+                            }
+                            activity.Window.SetBackgroundDrawable(new ColorDrawable(Color.White));
+
+                            if(transparencyLevel != WindowTransparencyLevel.None)
+                            {
+                                return;
+                            }
+                            break;
+                        case WindowTransparencyLevel.Transparent:
+                            if (!isBelowR)
+                            {
+                                activity.SetTranslucent(true);
+                            }
+                            if (isAboveR)
+                            {
+                                activity.Window?.ClearFlags(WindowManagerFlags.BlurBehind);
+
+                                var attr = activity.Window?.Attributes;
+                                if (attr != null)
+                                {
+                                    attr.BlurBehindRadius = 0;
+
+                                    activity.Window.Attributes = attr;
+                                }
+                            }
+                            activity.Window.SetBackgroundDrawable(new ColorDrawable(Color.Transparent));
+                            break;
+                        case WindowTransparencyLevel.Blur:
+                            if (isAboveR)
+                            {
+                                activity.SetTranslucent(true);
+                                activity.Window?.AddFlags(WindowManagerFlags.BlurBehind);
+
+                                var attr = activity.Window?.Attributes;
+                                if (attr != null)
+                                {
+                                    attr.BlurBehindRadius = 120;
+
+                                    activity.Window.Attributes = attr;
+                                }
+                                activity.Window.SetBackgroundDrawable(new ColorDrawable(Color.Transparent));
+                            }
+                            else
+                            {
+                                activity.Window?.ClearFlags(WindowManagerFlags.BlurBehind);
+                                activity.Window.SetBackgroundDrawable(new ColorDrawable(Color.White));
+
+                                return;
+                            }
+                            break;
+                    }
+                    TransparencyLevel = transparencyLevel;
+                }
+            }
        }
    }

--- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@ -111,7 +111,7 @@ namespace Avalonia.Rendering.Composition
                }
            }
            
-            batch.CommitedAt = Server.Clock.Elapsed;
+            batch.CommittedAt = Server.Clock.Elapsed;
            _server.EnqueueBatch(batch);
            
            lock (_pendingBatchLock)
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
@ -48,7 +48,7 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
        }
    }

-    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
    {
        if (reader.Read<byte>() == 1)
        {
@ -56,7 +56,7 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
            _renderCommands = reader.ReadObject<CompositionDrawList?>();
            _contentBounds = null;
        }
-        base.DeserializeChangesCore(reader, commitedAt);
+        base.DeserializeChangesCore(reader, committedAt);
    }

    protected override void RenderCore(CompositorDrawingContextProxy canvas, Rect currentTransformedClip)
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCustomCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCustomCompositionVisual.cs
@ -16,9 +16,9 @@ internal class ServerCompositionCustomVisual : ServerCompositionContainerVisual,
        _handler.Attach(this);
    }

-    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
    {
-        base.DeserializeChangesCore(reader, commitedAt);
+        base.DeserializeChangesCore(reader, committedAt);
        var count = reader.Read<int>();
        for (var c = 0; c < count; c++)
        {
@ -79,4 +79,4 @@ internal class ServerCompositionCustomVisual : ServerCompositionContainerVisual,
                ?.Log(_handler, $"Exception in {_handler.GetType().Name}.{nameof(CompositionCustomVisualHandler.OnRender)} {{0}}", e);
        }
    }
-}
+}
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
@ -14,7 +14,7 @@ namespace Avalonia.Rendering.Composition.Server
    {
        public List<T> List { get; } = new List<T>();

-        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
        {
            if (reader.Read<byte>() == 1)
            {
@ -23,7 +23,7 @@ namespace Avalonia.Rendering.Composition.Server
                for (var c = 0; c < count; c++) 
                    List.Add(reader.ReadObject<T>());
            }
-            base.DeserializeChangesCore(reader, commitedAt);
+            base.DeserializeChangesCore(reader, committedAt);
        }

        public override long LastChangedBy
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
@ -104,13 +104,13 @@ namespace Avalonia.Rendering.Composition.Server
        }

        protected void SetAnimatedValue<T>(CompositionProperty prop, ref T field,
-            TimeSpan commitedAt, IAnimationInstance animation) where T : struct
+            TimeSpan committedAt, IAnimationInstance animation) where T : struct
        {
            if (IsActive && _animations.TryGetValue(prop, out var oldAnimation))
                oldAnimation.Deactivate();
            _animations[prop] = animation;
            
-            animation.Initialize(commitedAt, ExpressionVariant.Create(field), prop);
+            animation.Initialize(committedAt, ExpressionVariant.Create(field), prop);
            if(IsActive)
                animation.Activate();
            
@ -165,7 +165,7 @@ namespace Avalonia.Rendering.Composition.Server

        public virtual CompositionProperty? GetCompositionProperty(string fieldName) => null;

-        protected virtual void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+        protected virtual void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
        {
            if (this is IDisposable disp
                && reader.Read<byte>() == 1)
@ -174,7 +174,7 @@ namespace Avalonia.Rendering.Composition.Server
        
        public void DeserializeChanges(BatchStreamReader reader, Batch batch)
        {
-            DeserializeChangesCore(reader, batch.CommitedAt);
+            DeserializeChangesCore(reader, batch.CommittedAt);
            ValuesInvalidated();
            ItselfLastChangedBy = batch.SequenceId;
        }
--- a/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
@ -29,7 +29,7 @@ namespace Avalonia.Rendering.Composition.Transport

        
        public BatchStreamData Changes { get; private set; }
-        public TimeSpan CommitedAt { get; set; }
+        public TimeSpan CommittedAt { get; set; }
        
        public void Complete()
        {
--- a/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatColorPalette.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatColorPalette.cs
@ -289,8 +289,8 @@ namespace Avalonia.Controls
        };

        // See: https://htmlcolorcodes.com/assets/downloads/flat-design-colors/flat-design-color-chart.png
-        protected static Color[,]? _colorChart = null;
-        protected static object _colorChartMutex = new object();
+        private static Color[,]? _colorChart = null;
+        private static readonly object _colorChartMutex = new();

        /// <summary>
        /// Initializes all color chart colors.
--- a/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatHalfColorPalette.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatHalfColorPalette.cs
@ -10,8 +10,8 @@ namespace Avalonia.Controls
    /// <inheritdoc cref="FlatColorPalette"/>
    public class FlatHalfColorPalette : IColorPalette
    {
-        protected static Color[,]? _colorChart = null;
-        protected static object _colorChartMutex = new object();
+        private static Color[,]? _colorChart = null;
+        private static readonly object _colorChartMutex = new();

        /// <summary>
        /// Initializes all color chart colors.
--- a/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialColorPalette.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialColorPalette.cs
@ -344,8 +344,8 @@ namespace Avalonia.Controls

        // See: https://material.io/design/color/the-color-system.html#tools-for-picking-colors
        // This is a reduced palette for uniformity
-        protected static Color[,]? _colorChart = null;
-        protected static object _colorChartMutex = new object();
+        private static Color[,]? _colorChart = null;
+        private static readonly object _colorChartMutex = new();

        /// <summary>
        /// Initializes all color chart colors.
--- a/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialHalfColorPalette.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialHalfColorPalette.cs
@ -10,8 +10,8 @@ namespace Avalonia.Controls
    /// <inheritdoc cref="MaterialColorPalette"/>
    public class MaterialHalfColorPalette : IColorPalette
    {
-        protected static Color[,]? _colorChart = null;
-        protected static object _colorChartMutex = new object();
+        private static Color[,]? _colorChart = null;
+        private static readonly object _colorChartMutex = new();

        /// <summary>
        /// Initializes all color chart colors.
--- a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
@ -31,7 +31,7 @@ namespace Avalonia.Controls
        /// <summary>
        /// Defines the <see cref="IsThreeState"/> property.
        /// </summary>
-        public static StyledProperty<bool> IsThreeStateProperty =
+        public static readonly StyledProperty<bool> IsThreeStateProperty =
            CheckBox.IsThreeStateProperty.AddOwner<DataGridCheckBoxColumn>();

        /// <summary>
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@ -185,7 +185,7 @@ namespace Avalonia.Controls
        /// <summary>
        /// Defines the <see cref="IsVisible"/> property.
        /// </summary>
-        public static StyledProperty<bool> IsVisibleProperty =
+        public static readonly StyledProperty<bool> IsVisibleProperty =
             Control.IsVisibleProperty.AddOwner<DataGridColumn>();

        /// <summary>
--- a/src/Avalonia.Controls/BorderVisual.cs
+++ b/src/Avalonia.Controls/BorderVisual.cs
@ -63,9 +63,9 @@ class CompositionBorderVisual : CompositionDrawListVisual
            
        }

-        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
        {
-            base.DeserializeChangesCore(reader, commitedAt);
+            base.DeserializeChangesCore(reader, committedAt);
            if (reader.Read<bool>())
                _cornerRadius = reader.Read<CornerRadius>();
        }
--- a/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs
+++ b/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs
@ -8,6 +8,6 @@
        /// <summary>
        /// Provides access to the internal <see cref="ToolTip.ToolTipProperty"/> for use in DevTools.
        /// </summary>
-        public static AvaloniaProperty<ToolTip?> ToolTipProperty = ToolTip.ToolTipProperty;
+        public static readonly AvaloniaProperty<ToolTip?> ToolTipProperty = ToolTip.ToolTipProperty;
    }
 }
--- a/src/Avalonia.Controls/SelectableTextBlock.cs
+++ b/src/Avalonia.Controls/SelectableTextBlock.cs
@ -300,7 +300,11 @@ namespace Avalonia.Controls

                        _wordSelectionStart = SelectionStart;

-                        SelectionEnd = StringUtils.NextWord(text, index);
+                        if (!StringUtils.IsEndOfWord(text, index))
+                        {
+                            SelectionEnd = StringUtils.NextWord(text, index);
+                        }
+                        
                        break;
                    case 3:
                        _wordSelectionStart = -1;
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@ -1475,7 +1475,11 @@ namespace Avalonia.Controls

                        _wordSelectionStart = SelectionStart;

-                        SelectionEnd = StringUtils.NextWord(text, index);
+                        if (!StringUtils.IsEndOfWord(text, index))
+                        {
+                            SelectionEnd = StringUtils.NextWord(text, index);
+                        }
+
                        break;
                    case 3:
                        _wordSelectionStart = -1;
--- a/src/Avalonia.Controls/Utils/StringUtils.cs
+++ b/src/Avalonia.Controls/Utils/StringUtils.cs
@ -67,6 +67,55 @@ namespace Avalonia.Controls.Utils
            }
        }

+        public static bool IsEndOfWord(string text, int index)
+        {
+            if (index >= text.Length)
+            {
+                return true;
+            }
+
+            var codepoint = new Codepoint(text[index]);
+        
+            if (!codepoint.IsWhiteSpace)
+            {
+                return false;
+            }
+            // A 'word' starts with an AlphaNumeric or some punctuation symbols immediately
+            // preceeded by lwsp.
+            if (index > 0)
+            {
+                var nextCodePoint = new Codepoint(text[index + 1]);
+
+                if (nextCodePoint.IsBreakChar)
+                {
+                    return true;
+                }
+            }
+
+            switch (codepoint.GeneralCategory)
+            {
+                case GeneralCategory.LowercaseLetter:
+                case GeneralCategory.TitlecaseLetter:
+                case GeneralCategory.UppercaseLetter:
+                case GeneralCategory.DecimalNumber:
+                case GeneralCategory.LetterNumber:
+                case GeneralCategory.OtherNumber:
+                case GeneralCategory.DashPunctuation:
+                case GeneralCategory.InitialPunctuation:
+                case GeneralCategory.OpenPunctuation:
+                case GeneralCategory.CurrencySymbol:
+                case GeneralCategory.MathSymbol:
+                    return false;
+
+                // TODO: How do you do this in .NET?
+                // case UnicodeCategory.OtherPunctuation:
+                //    // words cannot start with '.', but they can start with '&' or '*' (for example)
+                //    return g_unichar_break_type(buffer->text[index]) == G_UNICODE_BREAK_ALPHABETIC;
+                default:
+                    return true;
+            }
+        }
+
        public static int PreviousWord(string text, int cursor)
        {
            if (string.IsNullOrEmpty(text))
--- a/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
+++ b/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
@ -7,6 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <SupportedPlatform Remove="@(SupportedPlatform)" />
    <SupportedPlatform Include="browser" />
  </ItemGroup>

--- a/src/Browser/Avalonia.Browser.Blazor/AvaloniaView.cs
+++ b/src/Browser/Avalonia.Browser.Blazor/AvaloniaView.cs
@ -8,9 +8,10 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
 using BrowserView = Avalonia.Browser.AvaloniaView;

+[assembly: SupportedOSPlatform("browser")]
+
 namespace Avalonia.Browser.Blazor;

-[SupportedOSPlatform("browser")]
 public class AvaloniaView : ComponentBase
 {
    private Browser.AvaloniaView? _browserView;
--- a/src/Browser/Avalonia.Browser.Blazor/BlazorSingleViewLifetime.cs
+++ b/src/Browser/Avalonia.Browser.Blazor/BlazorSingleViewLifetime.cs
@ -5,7 +5,6 @@ using Avalonia.Controls.ApplicationLifetimes;

 namespace Avalonia.Browser.Blazor;

-[SupportedOSPlatform("browser")]
 public static class WebAppBuilder
 {
    public static AppBuilder SetupWithSingleViewLifetime(
--- a/src/Browser/Avalonia.Browser/AvaloniaView.cs
+++ b/src/Browser/Avalonia.Browser/AvaloniaView.cs
@ -18,7 +18,6 @@ using SkiaSharp;

 namespace Avalonia.Browser
 {
-    [System.Runtime.Versioning.SupportedOSPlatform("browser")] // gets rid of callsite warnings
    public partial class AvaloniaView : ITextInputMethodImpl
    {
        private static readonly PooledList<RawPointerPoint> s_intermediatePointsPooledList = new(ClearMode.Never);
--- a/src/Browser/Avalonia.Browser/BrowserSingleViewLifetime.cs
+++ b/src/Browser/Avalonia.Browser/BrowserSingleViewLifetime.cs
@ -5,7 +5,6 @@ using System.Runtime.Versioning;

 namespace Avalonia.Browser;

-[SupportedOSPlatform("browser")]
 public class BrowserSingleViewLifetime : ISingleViewApplicationLifetime
 {
    public AvaloniaView? View;
@ -22,7 +21,6 @@ public class BrowserPlatformOptions
    public Func<string, string> FrameworkAssetPathResolver { get; set; } = new(fileName => $"./{fileName}");
 }

-[SupportedOSPlatform("browser")]
 public static class WebAppBuilder
 {
    public static AppBuilder SetupBrowserApp(
--- a/src/Browser/Avalonia.Browser/BrowserTopLevelImpl.cs
+++ b/src/Browser/Avalonia.Browser/BrowserTopLevelImpl.cs
@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.Versioning;
 using Avalonia.Browser.Skia;
 using Avalonia.Browser.Storage;
 using Avalonia.Controls;
@ -14,9 +15,10 @@ using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;

+[assembly: SupportedOSPlatform("browser")]
+
 namespace Avalonia.Browser
 {
-    [System.Runtime.Versioning.SupportedOSPlatform("browser")] // gets rid of callsite warnings
    internal class BrowserTopLevelImpl : ITopLevelImplWithTextInputMethod, ITopLevelImplWithNativeControlHost, ITopLevelImplWithStorageProvider
    {
        private Size _clientSize;
@ -201,7 +203,11 @@ namespace Avalonia.Browser

        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
        {
-
+            if (transparencyLevel == WindowTransparencyLevel.None
+                || transparencyLevel == WindowTransparencyLevel.Transparent)
+            {
+                TransparencyLevel = transparencyLevel;
+            }
        }

        public Size ClientSize => _clientSize;
@ -221,7 +227,7 @@ namespace Avalonia.Browser
        public IMouseDevice MouseDevice { get; } = new MouseDevice();

        public IKeyboardDevice KeyboardDevice { get; } = BrowserWindowingPlatform.Keyboard;
-        public WindowTransparencyLevel TransparencyLevel { get; }
+        public WindowTransparencyLevel TransparencyLevel { get; private set; }
        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; }

        public ITextInputMethodImpl TextInputMethod => _avaloniaView;
--- a/src/Browser/Avalonia.Browser/Interop/CanvasHelper.cs
+++ b/src/Browser/Avalonia.Browser/Interop/CanvasHelper.cs
@ -6,7 +6,6 @@ namespace Avalonia.Browser.Interop;

 internal record GLInfo(int ContextId, uint FboId, int Stencils, int Samples, int Depth);

-[System.Runtime.Versioning.SupportedOSPlatform("browser")] // gets rid of callsite warnings
 internal static partial class CanvasHelper
 {

--- a/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpuRenderTarget.cs
+++ b/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpuRenderTarget.cs
@ -14,14 +14,12 @@ namespace Avalonia.Browser.Skia
            _size = browserSkiaSurface.Size;

            var glFbInfo = new GRGlFramebufferInfo(browserSkiaSurface.GlInfo.FboId, browserSkiaSurface.ColorType.ToGlSizedFormat());
-            {
-                _browserSkiaSurface = browserSkiaSurface;
-                _renderTarget = new GRBackendRenderTarget(
-                    (int)(browserSkiaSurface.Size.Width * browserSkiaSurface.Scaling),
-                    (int)(browserSkiaSurface.Size.Height * browserSkiaSurface.Scaling),
-                    browserSkiaSurface.GlInfo.Samples,
-                    browserSkiaSurface.GlInfo.Stencils, glFbInfo);
-            }
+            _browserSkiaSurface = browserSkiaSurface;
+            _renderTarget = new GRBackendRenderTarget(
+                (int)(browserSkiaSurface.Size.Width * browserSkiaSurface.Scaling),
+                (int)(browserSkiaSurface.Size.Height * browserSkiaSurface.Scaling),
+                browserSkiaSurface.GlInfo.Samples,
+                browserSkiaSurface.GlInfo.Stencils, glFbInfo);
        }

        public void Dispose()
--- a/src/Browser/Avalonia.Browser/Storage/BlobReadableStream.cs
+++ b/src/Browser/Avalonia.Browser/Storage/BlobReadableStream.cs
@ -7,7 +7,6 @@ using Avalonia.Browser.Interop;

 namespace Avalonia.Browser.Storage;

-[System.Runtime.Versioning.SupportedOSPlatform("browser")]
 internal class BlobReadableStream : Stream
 {
    private JSObject? _jSReference;
--- a/src/Browser/Avalonia.Browser/Storage/BrowserStorageProvider.cs
+++ b/src/Browser/Avalonia.Browser/Storage/BrowserStorageProvider.cs
@ -13,7 +13,6 @@ namespace Avalonia.Browser.Storage;

 internal record FilePickerAcceptType(string Description, IReadOnlyDictionary<string, IReadOnlyList<string>> Accept);

-[SupportedOSPlatform("browser")]
 internal class BrowserStorageProvider : IStorageProvider
 {
    internal const string PickerCancelMessage = "The user aborted a request";
--- a/src/Browser/Avalonia.Browser/Storage/WriteableStream.cs
+++ b/src/Browser/Avalonia.Browser/Storage/WriteableStream.cs
@ -7,7 +7,6 @@ using Avalonia.Browser.Interop;

 namespace Avalonia.Browser.Storage;

-[System.Runtime.Versioning.SupportedOSPlatform("browser")]
 // Loose wrapper implementaion of a stream on top of FileAPI FileSystemWritableFileStream
 internal sealed class WriteableStream : Stream
 {
--- a/src/Browser/Avalonia.Browser/webapp/modules/avalonia/dom.ts
+++ b/src/Browser/Avalonia.Browser/webapp/modules/avalonia/dom.ts
@ -17,7 +17,6 @@ export class AvaloniaDOM {
        const canvas = document.createElement("canvas");
        canvas.id = `canvas${randomIdPart}`;
        canvas.classList.add("avalonia-canvas");
-        canvas.style.backgroundColor = "#ccc";
        canvas.style.width = "100%";
        canvas.style.position = "absolute";

--- a/src/tools/DevGenerators/CompositionGenerator/Generator.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
@ -257,7 +257,7 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
            if (cl.Properties.Count > 0)
            {
                server = server.AddMembers(((MethodDeclarationSyntax)ParseMemberDeclaration(
-                            $"protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt){{}}")
+                            $"protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt){{}}")
                        !)
                    .WithBody(ApplyDeserializeChangesEpilogue(deserializeMethodBody, cl)));
                server = server.AddMembers(MethodDeclaration(ParseTypeName("void"), "OnFieldsDeserialized")
@ -481,7 +481,7 @@ return;
        private static BlockSyntax DeserializeChangesPrologue(GClass cl)
        {
            return Block(ParseStatement($@"
-base.DeserializeChangesCore(reader, commitedAt);
+base.DeserializeChangesCore(reader, committedAt);
 DeserializeChangesExtra(reader);
 var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
 "));
@ -500,7 +500,7 @@ var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
            {
                code = $@"
    if((changed & {changedFieldsType}.{prop.Name}Animated) == {changedFieldsType}.{prop.Name}Animated)
-            SetAnimatedValue({CompositionPropertyField(prop)}, ref {PropertyBackingFieldName(prop)}, commitedAt, reader.ReadObject<IAnimationInstance>());
+            SetAnimatedValue({CompositionPropertyField(prop)}, ref {PropertyBackingFieldName(prop)}, committedAt, reader.ReadObject<IAnimationInstance>());
    else ";
            }