Merge branch 'AvaloniaUI:master' into master

native/Avalonia.Native/src/OSX/AvnWindow.mm

@@ -33,6 +33,7 @@
     bool _isEnabled;
     bool _canBecomeKeyWindow;
     bool _isExtended;
+    bool _isTransitioningToFullScreen;
     AvnMenu* _menu;
 }
 
@@ -175,6 +176,7 @@
     [self setBackgroundColor: [NSColor clearColor]];
 
     _isExtended = false;
+    _isTransitioningToFullScreen = false;
 
     if(self.isDialog)
     {
@@ -349,6 +351,7 @@
 
 - (void)windowWillEnterFullScreen:(NSNotification *_Nonnull)notification
 {
+    _isTransitioningToFullScreen = true;
     auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
 
     if(parent != nullptr)
@@ -359,6 +362,7 @@
 
 - (void)windowDidEnterFullScreen:(NSNotification *_Nonnull)notification
 {
+    _isTransitioningToFullScreen = false;
     auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
 
     if(parent != nullptr)
@@ -441,7 +445,10 @@
                     _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, static_cast<uint32>([event timestamp] * 1000), AvnInputModifiersNone, point, delta);
                 }
                 
-                _parent->BringToFront();
+                if(!_isTransitioningToFullScreen)
+                {
+                    _parent->BringToFront();
+                }
             }
             break;
 

native/Avalonia.Native/src/OSX/PopupImpl.mm

@@ -26,17 +26,13 @@ private:
     PopupImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
     {
         WindowEvents = events;
+        [Window setLevel:NSPopUpMenuWindowLevel];
     }
 protected:
     virtual NSWindowStyleMask GetStyle() override
     {
         return NSWindowStyleMaskBorderless;
     }
-    
-    virtual void OnInitialiseNSWindow () override
-    {
-        [Window setLevel:NSPopUpMenuWindowLevel];
-    }
 
 public:
     virtual bool ShouldTakeFocusOnShow() override

native/Avalonia.Native/src/OSX/WindowBaseImpl.h

@@ -106,8 +106,6 @@ protected:
     virtual NSWindowStyleMask GetStyle();
 
     void UpdateStyle();
-                           
-    virtual void OnInitialiseNSWindow ();
 
 private:
     void CreateNSWindow (bool isDialog);

native/Avalonia.Native/src/OSX/WindowBaseImpl.mm

@@ -90,8 +90,6 @@ HRESULT WindowBaseImpl::Show(bool activate, bool isDialog) {
     START_COM_CALL;
 
     @autoreleasepool {
-        InitialiseNSWindow();
-
         if(hasPosition)
         {
             SetPosition(lastPositionSet);
@@ -569,11 +567,6 @@ void WindowBaseImpl::CreateNSWindow(bool isDialog) {
     }
 }
 
-void WindowBaseImpl::OnInitialiseNSWindow()
-{
-    
-}
-
 void WindowBaseImpl::InitialiseNSWindow() {
     if(Window != nullptr) {
         [Window setContentView:StandardContainer];
@@ -596,8 +589,6 @@ void WindowBaseImpl::InitialiseNSWindow() {
                 [GetWindowProtocol() showWindowMenuWithAppMenu];
             }
         }
-        
-        OnInitialiseNSWindow();
     }
 }
 

native/Avalonia.Native/src/OSX/WindowImpl.h

@@ -13,6 +13,7 @@
 class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, public IWindowStateChanged
 {
 private:
+    bool _isEnabled;
     bool _canResize;
     bool _fullScreenActive;
     SystemDecorations _decorations;
@@ -92,8 +93,6 @@ BEGIN_INTERFACE_MAP()
 
     virtual bool IsDialog() override;
     
-    virtual void OnInitialiseNSWindow() override;
-    
     virtual void BringToFront () override;
     
     bool CanBecomeKeyWindow ();
@@ -102,6 +101,7 @@ protected:
     virtual NSWindowStyleMask GetStyle() override;
 
 private:
+    void OnInitialiseNSWindow();
     NSString *_lastTitle;
 };
 

native/Avalonia.Native/src/OSX/WindowImpl.mm

@@ -10,6 +10,7 @@
 #include "WindowProtocol.h"
 
 WindowImpl::WindowImpl(IAvnWindowEvents *events, IAvnGlContext *gl) : WindowBaseImpl(events, gl) {
+    _isEnabled = true;
     _children = std::list<WindowImpl*>();
     _isClientAreaExtended = false;
     _extendClientHints = AvnDefaultChrome;
@@ -23,6 +24,8 @@ WindowImpl::WindowImpl(IAvnWindowEvents *events, IAvnGlContext *gl) : WindowBase
     _lastTitle = @"";
     _parent = nullptr;
     WindowEvents = events;
+    
+    OnInitialiseNSWindow();
 }
 
 void WindowImpl::HideOrShowTrafficLights() {
@@ -31,15 +34,16 @@ void WindowImpl::HideOrShowTrafficLights() {
     }
 
     bool wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-    bool hasTrafficLights = _isClientAreaExtended ? !wantsChrome : _decorations != SystemDecorationsFull;
+    bool hasTrafficLights = _isClientAreaExtended ? wantsChrome : _decorations == SystemDecorationsFull;
     
-    [[Window standardWindowButton:NSWindowCloseButton] setHidden:hasTrafficLights];
-    [[Window standardWindowButton:NSWindowMiniaturizeButton] setHidden:hasTrafficLights];
-    [[Window standardWindowButton:NSWindowZoomButton] setHidden:hasTrafficLights];
+    [[Window standardWindowButton:NSWindowCloseButton] setHidden:!hasTrafficLights];
+    [[Window standardWindowButton:NSWindowMiniaturizeButton] setHidden:!hasTrafficLights];
+    [[Window standardWindowButton:NSWindowZoomButton] setHidden:!hasTrafficLights];
 }
 
 void WindowImpl::OnInitialiseNSWindow(){
     [GetWindowProtocol() setCanBecomeKeyWindow:true];
+    
     [Window disableCursorRects];
     [Window setTabbingMode:NSWindowTabbingModeDisallowed];
     [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
@@ -76,7 +80,9 @@ HRESULT WindowImpl::SetEnabled(bool enable) {
     START_COM_CALL;
 
     @autoreleasepool {
+        _isEnabled = enable;
         [GetWindowProtocol() setEnabled:enable];
+        UpdateStyle();
         return S_OK;
     }
 }
@@ -88,11 +94,8 @@ HRESULT WindowImpl::SetParent(IAvnWindow *parent) {
         if(_parent != nullptr)
         {
             _parent->_children.remove(this);
-            auto parent = _parent;
             
-            dispatch_async(dispatch_get_main_queue(), ^{
-                parent->BringToFront();
-            });
+            _parent->BringToFront();
         }
 
         auto cparent = dynamic_cast<WindowImpl *>(parent);
@@ -119,20 +122,23 @@ HRESULT WindowImpl::SetParent(IAvnWindow *parent) {
 
 void WindowImpl::BringToFront()
 {
-    if(IsDialog())
+    if(Window != nullptr)
     {
-        Activate();
-    }
-    else
-    {
-        [Window orderFront:nullptr];
-    }
-    
-    [Window invalidateShadow];
-    
-    for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
-    {
-        (*iterator)->BringToFront();
+        if(IsDialog())
+        {
+            Activate();
+        }
+        else
+        {
+            [Window orderFront:nullptr];
+        }
+        
+        [Window invalidateShadow];
+        
+        for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
+        {
+            (*iterator)->BringToFront();
+        }
     }
 }
 
@@ -561,6 +567,11 @@ bool WindowImpl::IsDialog() {
 
 NSWindowStyleMask WindowImpl::GetStyle() {
     unsigned long s = NSWindowStyleMaskBorderless;
+    
+    if(_actualWindowState == FullScreen)
+    {
+        s |= NSWindowStyleMaskFullScreen;
+    }
 
     switch (_decorations) {
         case SystemDecorationsNone:
@@ -574,7 +585,7 @@ NSWindowStyleMask WindowImpl::GetStyle() {
         case SystemDecorationsFull:
             s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable;
 
-            if (_canResize) {
+            if (_canResize && _isEnabled) {
                 s = s | NSWindowStyleMaskResizable;
             }
             break;

samples/ControlCatalog/MainWindow.xaml.cs

@@ -29,8 +29,6 @@ namespace ControlCatalog
 
             DataContext = new MainWindowViewModel(_notificationArea);
             _recentMenu = ((NativeMenu.GetMenu(this).Items[0] as NativeMenuItem).Menu.Items[2] as NativeMenuItem).Menu;
-
-            ExtendClientAreaChromeHints = Avalonia.Platform.ExtendClientAreaChromeHints.OSXThickTitleBar;
         }
 
         public static string MenuQuitHeader => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "Quit Avalonia" : "E_xit";

src/Avalonia.Base/Styling/Style.cs

@@ -94,7 +94,6 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets the style's setters.
         /// </summary>
-        [Content]
         public IList<ISetter> Setters => _setters ??= new List<ISetter>();
 
         /// <summary>
@@ -107,6 +106,9 @@ namespace Avalonia.Styling
 
         public event EventHandler? OwnerChanged;
 
+        public void Add(ISetter setter) => Setters.Add(setter);
+        public void Add(IStyle style) => Children.Add(style);
+
         public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
         {
             target = target ?? throw new ArgumentNullException(nameof(target));

src/Avalonia.Controls/Flyouts/FlyoutBase.cs

@@ -219,7 +219,7 @@ namespace Avalonia.Controls.Primitives
                 ((ISetLogicalParent)Popup).SetParent(null);
             }
 
-            if (Popup.PlacementTarget != placementTarget)
+            if (Popup.Parent == null || Popup.PlacementTarget != placementTarget)
             {
                 Popup.PlacementTarget = Target = placementTarget;
                 ((ISetLogicalParent)Popup).SetParent(placementTarget);

src/Avalonia.Dialogs/Avalonia.Dialogs.csproj

@@ -14,6 +14,10 @@
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
   </ItemGroup>
 
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.X11, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
   <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>

src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs

@@ -8,7 +8,7 @@ namespace Avalonia.Dialogs
 {
     public static class ManagedFileDialogExtensions
     {
-        private class ManagedSystemDialogImpl<T> : ISystemDialogImpl where T : Window, new()
+        internal class ManagedSystemDialogImpl<T> : ISystemDialogImpl where T : Window, new()
         {
             async Task<string[]> Show(SystemDialog d, Window parent, ManagedFileDialogOptions options = null)
             {
@@ -141,7 +141,7 @@ namespace Avalonia.Dialogs
 
         public static Task<string[]> ShowManagedAsync(this OpenFileDialog dialog, Window parent,
             ManagedFileDialogOptions options = null) => ShowManagedAsync<Window>(dialog, parent, options);
-        
+
         public static Task<string[]> ShowManagedAsync<TWindow>(this OpenFileDialog dialog, Window parent,
             ManagedFileDialogOptions options = null) where TWindow : Window, new()
         {

src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj

@@ -2,10 +2,12 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
     <PackageReference Include="Tmds.DBus" Version="0.9.0" />
   </ItemGroup>
   <ItemGroup Label="InternalsVisibleTo">

src/Avalonia.FreeDesktop/DBusFileChooser.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Tmds.DBus;
+
+[assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
+namespace Avalonia.FreeDesktop
+{
+    [DBusInterface("org.freedesktop.portal.FileChooser")]
+    internal interface IFileChooser : IDBusObject
+    {
+        Task<ObjectPath> OpenFileAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<ObjectPath> SaveFileAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<ObjectPath> SaveFilesAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<T> GetAsync<T>(string prop);
+        Task<FileChooserProperties> GetAllAsync();
+        Task SetAsync(string prop, object val);
+        Task<IDisposable> WatchPropertiesAsync(Action<PropertyChanges> handler);
+    }
+
+    [Dictionary]
+    internal class FileChooserProperties
+    {
+        public uint Version { get; set; }
+    }
+
+    internal static class FileChooserExtensions
+    {
+        public static Task<uint> GetVersionAsync(this IFileChooser o) => o.GetAsync<uint>("version");
+    }
+}

src/Avalonia.FreeDesktop/DBusHelper.cs

@@ -6,7 +6,7 @@ using Tmds.DBus;
 
 namespace Avalonia.FreeDesktop
 {
-    public class DBusHelper
+    public static class DBusHelper
     {
         /// <summary>
         /// This class uses synchronous execution at DBus connection establishment stage
@@ -14,14 +14,14 @@ namespace Avalonia.FreeDesktop
         /// </summary>
         private class DBusSyncContext : SynchronizationContext
         {
-            private SynchronizationContext _ctx;
-            private object _lock = new object();
+            private readonly object _lock = new();
+            private SynchronizationContext? _ctx;
 
             public override void Post(SendOrPostCallback d, object state)
             {
                 lock (_lock)
                 {
-                    if (_ctx != null)
+                    if (_ctx is not null)
                         _ctx?.Post(d, state);
                     else
                         lock (_lock)
@@ -33,10 +33,9 @@ namespace Avalonia.FreeDesktop
             {
                 lock (_lock)
                 {
-                    if (_ctx != null)
+                    if (_ctx is not null)
                         _ctx?.Send(d, state);
                     else
-
                         d(state);
                 }
             }
@@ -47,15 +46,14 @@ namespace Avalonia.FreeDesktop
                     _ctx = new AvaloniaSynchronizationContext();
             }
         }
-        public static Connection Connection { get; private set; }
 
-        public static Connection TryInitialize(string dbusAddress = null)
+        public static Connection? Connection { get; private set; }
+
+        public static Connection? TryInitialize(string? dbusAddress = null)
+            => Connection ?? TryCreateNewConnection(dbusAddress);
+
+        public static Connection? TryCreateNewConnection(string? dbusAddress = null)
         {
-            return Connection ?? TryCreateNewConnection(dbusAddress);
-        }
-        
-        public static Connection TryCreateNewConnection(string dbusAddress = null)
-        { 
             var oldContext = SynchronizationContext.Current;
             try
             {

src/Avalonia.FreeDesktop/DBusRequest.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Tmds.DBus;
+
+[assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
+namespace Avalonia.FreeDesktop
+{
+    [DBusInterface("org.freedesktop.portal.Request")]
+    internal interface IRequest : IDBusObject
+    {
+        Task CloseAsync();
+        Task<IDisposable> WatchResponseAsync(Action<(uint response, IDictionary<string, object> results)> handler, Action<Exception> onError = null);
+    }
+}

src/Avalonia.FreeDesktop/DBusSystemDialog.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Logging;
+using Tmds.DBus;
+
+namespace Avalonia.FreeDesktop
+{
+    internal class DBusSystemDialog : ISystemDialogImpl
+    {
+        private readonly IFileChooser _fileChooser;
+
+        internal static DBusSystemDialog? TryCreate()
+        {
+            var fileChooser = DBusHelper.Connection?.CreateProxy<IFileChooser>("org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop");
+            if (fileChooser is null)
+                return null;
+            try
+            {
+                fileChooser.GetVersionAsync().GetAwaiter().GetResult();
+                return new DBusSystemDialog(fileChooser);
+            }
+            catch (Exception e)
+            {
+                Logger.TryGet(LogEventLevel.Error, LogArea.X11Platform)?.Log(null, $"Unable to connect to org.freedesktop.portal.Desktop: {e.Message}");
+                return null;
+            }
+        }
+
+        private DBusSystemDialog(IFileChooser fileChooser)
+        {
+            _fileChooser = fileChooser;
+        }
+
+        public async Task<string[]?> ShowFileDialogAsync(FileDialog dialog, Window parent)
+        {
+            var parentWindow = $"x11:{parent.PlatformImpl!.Handle.Handle.ToString("X")}";
+            ObjectPath objectPath;
+            var options = new Dictionary<string, object>();
+            if (dialog.Filters is not null)
+                options.Add("filters", ParseFilters(dialog));
+
+            switch (dialog)
+            {
+                case OpenFileDialog openFileDialog:
+                    options.Add("multiple", openFileDialog.AllowMultiple);
+                    objectPath = await _fileChooser.OpenFileAsync(parentWindow, openFileDialog.Title ?? string.Empty, options);
+                    break;
+                case SaveFileDialog saveFileDialog:
+                    if (saveFileDialog.InitialFileName is not null)
+                        options.Add("current_name", saveFileDialog.InitialFileName);
+                    if (saveFileDialog.Directory is not null)
+                        options.Add("current_folder", Encoding.UTF8.GetBytes(saveFileDialog.Directory));
+                    objectPath = await _fileChooser.SaveFileAsync(parentWindow, saveFileDialog.Title ?? string.Empty, options);
+                    break;
+            }
+
+            var request = DBusHelper.Connection!.CreateProxy<IRequest>("org.freedesktop.portal.Request", objectPath);
+            var tsc = new TaskCompletionSource<string[]?>();
+            using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException);
+            var uris = await tsc.Task;
+            if (uris is null)
+                return null;
+            for (var i = 0; i < uris.Length; i++)
+                uris[i] = new Uri(uris[i]).AbsolutePath;
+            return uris;
+        }
+
+        public async Task<string?> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
+        {
+            var parentWindow = $"x11:{parent.PlatformImpl!.Handle.Handle.ToString("X")}";
+            var options = new Dictionary<string, object>
+            {
+                { "directory", true }
+            };
+            var objectPath = await _fileChooser.OpenFileAsync(parentWindow, dialog.Title ?? string.Empty, options);
+            var request = DBusHelper.Connection!.CreateProxy<IRequest>("org.freedesktop.portal.Request", objectPath);
+            var tsc = new TaskCompletionSource<string[]?>();
+            using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException);
+            var uris = await tsc.Task;
+            if (uris is null)
+                return null;
+            return uris.Length != 1 ? string.Empty : new Uri(uris[0]).AbsolutePath;
+        }
+
+        private static (string name, (uint style, string extension)[])[] ParseFilters(FileDialog dialog)
+        {
+            var filters = new (string name, (uint style, string extension)[])[dialog.Filters!.Count];
+            for (var i = 0; i < filters.Length; i++)
+            {
+                var extensions = dialog.Filters[i].Extensions.Select(static x => (0u, x)).ToArray();
+                filters[i] = (dialog.Filters[i].Name ?? string.Empty, extensions);
+            }
+
+            return filters;
+        }
+    }
+}

src/Avalonia.Themes.Fluent/Controls/Button.xaml

@@ -40,53 +40,49 @@
       </ControlTemplate>
     </Setter>
 
-    <Style.Children>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^.accent">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
+      </Style>
+
       <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
       </Style>
 
       <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
       </Style>
 
       <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
-      </Style>
-
-      <Style Selector="^.accent">
-        <Style.Children>
-          <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
-          </Style>
-
-          <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
-            <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
-          </Style>
-
-          <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
-            <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
-          </Style>
-
-          <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
-            <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
-          </Style>
-        </Style.Children>
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
       </Style>
-    </Style.Children>
+    </Style>
   </Style>
 
   <Style Selector="Button, RepeatButton, ToggleButton, DropDownButton">

src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml

@@ -56,266 +56,242 @@
     </ControlTemplate>
   </Setter>
 
-  <Style.Children>
-    <!-- Unchecked Normal State -->
+  <!-- Unchecked Normal State -->
+  <Style Selector="^ /template/ Border#NormalRectangle">
+    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}" />
+    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
+  </Style>
+
+  <Style Selector="^ /template/ Path#CheckGlyph">
+    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+
+  <!-- Unchecked PointerOver State -->
+  <Style Selector="^:pointerover">
+    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
+    </Style>
+
+    <Style Selector="^ /template/ Border#PART_Border">
+      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
+    </Style>
+
+    <Style Selector="^ /template/ Border#NormalRectangle">
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
+    </Style>
+
+    <Style Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
+    </Style>
+  </Style>
+
+  <!-- Unchecked Pressed State -->
+  <Style Selector="^:pressed">
+    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
+    </Style>
+
+    <Style Selector="^ /template/ Border#PART_Border">
+      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
+    </Style>
+
     <Style Selector="^ /template/ Border#NormalRectangle">
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
     </Style>
 
     <Style Selector="^ /template/ Path#CheckGlyph">
-      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
-      <Setter Property="Opacity" Value="0" />
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
     </Style>
+  </Style>
 
-    <!-- Unchecked PointerOver State -->
+  <!-- Unchecked Disabled state -->
+  <Style Selector="^:disabled">
+    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
+    </Style>
+
+    <Style Selector="^ /template/ Border#PART_Border">
+      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
+    </Style>
+
+    <Style Selector="^ /template/ Border#NormalRectangle">
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
+    </Style>
+
+    <Style Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
+    </Style>
+  </Style>
+
+  <Style Selector="^:checked">
+    <!-- Checked Normal State -->
+    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundChecked}" />
+    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundChecked}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
+
+    <Style Selector="^ /template/ Border#NormalRectangle">
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+    </Style>
+
+    <Style Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
+      <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
+      <Setter Property="Width" Value="9" />
+      <Setter Property="Opacity" Value="1" />
+      <Setter Property="FlowDirection" Value="LeftToRight" />
+    </Style>
+
+    <!-- Checked PointerOver State -->
     <Style Selector="^:pointerover">
-      <Style.Children>
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#PART_Border">
-          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
-        </Style>
-
-        <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
-        </Style>
-      </Style.Children>
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
+      </Style>
     </Style>
 
-    <!-- Unchecked Pressed State -->
+    <!-- Checked Pressed State -->
     <Style Selector="^:pressed">
-      <Style.Children>
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#PART_Border">
-          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
-        </Style>
-
-        <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
-        </Style>
-      </Style.Children>
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
+      </Style>
     </Style>
 
-    <!-- Unchecked Disabled state -->
+    <!-- Checked Disabled State -->
     <Style Selector="^:disabled">
-      <Style.Children>
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#PART_Border">
-          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
-        </Style>
-
-        <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
-        </Style>
-      </Style.Children>
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
+      </Style>
     </Style>
+  </Style>
 
-    <Style Selector="^:checked">
-      <!-- Checked Normal State -->
-      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundChecked}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundChecked}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
-
-      <Style.Children>
-        <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-        </Style>
-
-        <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
-          <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
-          <Setter Property="Width" Value="9" />
-          <Setter Property="Opacity" Value="1" />
-          <Setter Property="FlowDirection" Value="LeftToRight" />
-        </Style>
-
-        <!-- Checked PointerOver State -->
-        <Style Selector="^:pointerover">
-          <Style.Children>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-              <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#PART_Border">
-              <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#NormalRectangle">
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
-              <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
-            </Style>
-
-            <Style Selector="^ /template/ Path#CheckGlyph">
-              <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
-            </Style>
-          </Style.Children>
-        </Style>
-
-        <!-- Checked Pressed State -->
-        <Style Selector="^:pressed">
-          <Style.Children>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-              <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#PART_Border">
-              <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#NormalRectangle">
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
-              <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
-            </Style>
-
-            <Style Selector="^ /template/ Path#CheckGlyph">
-              <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
-            </Style>
-          </Style.Children>
-        </Style>
-
-        <!-- Checked Disabled State -->
-        <Style Selector="^:disabled">
-          <Style.Children>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-              <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#PART_Border">
-              <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#NormalRectangle">
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
-              <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
-            </Style>
-
-            <Style Selector="^ /template/ Path#CheckGlyph">
-              <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
-            </Style>
-          </Style.Children>
-        </Style>
-      </Style.Children>
+  <Style Selector="^:indeterminate">
+    <!-- Indeterminate Normal State -->
+    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
+    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminate}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
+
+    <Style Selector="^ /template/ Border#NormalRectangle">
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
     </Style>
 
-    <Style Selector="^:indeterminate">
-      <!-- Indeterminate Normal State -->
-      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminate}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
-
-      <Style.Children>
-        <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
-        </Style>
-
-        <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
-          <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
-          <Setter Property="Width" Value="7" />
-          <Setter Property="Opacity" Value="1" />
-        </Style>
-
-        <!-- Indeterminate PointerOver State -->
-        <Style Selector="^:pointerover">
-          <Style.Children>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-              <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#PART_Border">
-              <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#NormalRectangle">
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
-              <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
-            </Style>
-
-            <Style Selector="^ /template/ Path#CheckGlyph">
-              <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
-            </Style>
-          </Style.Children>
-        </Style>
-
-        <!-- Indeterminate Pressed State -->
-        <Style Selector="^:pressed">
-          <Style.Children>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-              <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#PART_Border">
-              <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#NormalRectangle">
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
-              <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
-            </Style>
-
-            <Style Selector="^ /template/ Path#CheckGlyph">
-              <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
-            </Style>
-          </Style.Children>
-        </Style>
-
-        <!-- Indeterminate Disabled State -->
-        <Style Selector="^:disabled">
-          <Style.Children>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-              <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#PART_Border">
-              <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
-            </Style>
-
-            <Style Selector="^ /template/ Border#NormalRectangle">
-              <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
-              <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
-            </Style>
-
-            <Style Selector="^ /template/ Path#CheckGlyph">
-              <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
-            </Style>
-          </Style.Children>
-        </Style>
-      </Style.Children>
+    <Style Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
+      <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
+      <Setter Property="Width" Value="7" />
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <!-- Indeterminate PointerOver State -->
+    <Style Selector="^:pointerover">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
+      </Style>
+    </Style>
+
+    <!-- Indeterminate Pressed State -->
+    <Style Selector="^:pressed">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
+      </Style>
+    </Style>
+
+    <!-- Indeterminate Disabled State -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
+      </Style>
     </Style>
-  </Style.Children>
+  </Style>
 </Style>

src/Avalonia.X11/X11Platform.cs

@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Dialogs;
 using Avalonia.FreeDesktop;
 using Avalonia.FreeDesktop.DBusIme;
 using Avalonia.Input;
@@ -15,7 +16,6 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.X11;
 using Avalonia.X11.Glx;
-using Avalonia.X11.NativeDialogs;
 using static Avalonia.X11.XLib;
 
 namespace Avalonia.X11
@@ -80,7 +80,7 @@ namespace Avalonia.X11
                 .Bind<IClipboard>().ToConstant(new X11Clipboard(this))
                 .Bind<IPlatformSettings>().ToConstant(new PlatformSettingsStub())
                 .Bind<IPlatformIconLoader>().ToConstant(new X11IconLoader(Info))
-                .Bind<ISystemDialogImpl>().ToConstant(new GtkSystemDialog())
+                .Bind<ISystemDialogImpl>().ToConstant(DBusSystemDialog.TryCreate() as ISystemDialogImpl ?? new ManagedFileDialogExtensions.ManagedSystemDialogImpl<Window>())
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new LinuxMountedVolumeInfoProvider())
                 .Bind<IPlatformLifetimeEventsImpl>().ToConstant(new X11PlatformLifetimeEvents(this));
             
@@ -209,10 +209,10 @@ namespace Avalonia
         public bool OverlayPopups { get; set; }
 
         /// <summary>
-        /// Enables global menu support on Linux desktop environments where it's supported (e. g. XFCE and MATE with plugin, KDE, etc).
-        /// The default value is false.
+        /// Enables native file dialogs as well as global menu support on Linux desktop environments where it's supported (e. g. XFCE and MATE with plugin, KDE, etc).
+        /// The default value is true.
         /// </summary>
-        public bool UseDBusMenu { get; set; }
+        public bool UseDBusMenu { get; set; } = true;
 
         /// <summary>
         /// Deferred renderer would be used when set to true. Immediate renderer when set to false. The default value is true.

src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs

@@ -233,12 +233,12 @@ namespace Avalonia.Web.Blazor
 
         private void OnKeyDown(KeyboardEventArgs e)
         {
-            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, e.Code, GetModifiers(e));
+            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, e.Code, e.Key, GetModifiers(e));
         }
 
         private void OnKeyUp(KeyboardEventArgs e)
         {
-            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyUp, e.Code, GetModifiers(e));
+            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyUp, e.Code, e.Key, GetModifiers(e));
         }
 
         private void OnInput(ChangeEventArgs e)

src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs

@@ -91,9 +91,16 @@ namespace Avalonia.Web.Blazor
             }
         }
 
-        public void RawKeyboardEvent(RawKeyEventType type, string key, RawInputModifiers modifiers)
+        public void RawKeyboardEvent(RawKeyEventType type, string code, string key, RawInputModifiers modifiers)
         {
-            if (Keycodes.KeyCodes.TryGetValue(key, out var avkey))
+            if (Keycodes.KeyCodes.TryGetValue(code, out var avkey))
+            {
+                if (_inputRoot is { })
+                {
+                    Input?.Invoke(new RawKeyEventArgs(KeyboardDevice, Timestamp, _inputRoot, type, avkey, modifiers));
+                }
+            }
+            else if (Keycodes.KeyCodes.TryGetValue(key, out avkey))
             {
                 if (_inputRoot is { })
                 {

tests/Avalonia.Controls.UnitTests/FlyoutTests.cs

@@ -451,6 +451,28 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Null(popup.Parent);
             }
         }
+        
+        [Fact]
+        public void Should_Reset_Popup_Parent_On_Target_Attach_Following_Detach()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var userControl = new UserControl();
+                var window = PreparedWindow(userControl);
+                window.Show();
+                
+                var flyout = new TestFlyout();
+                flyout.ShowAt(userControl);
+                
+                var popup = Assert.IsType<Popup>(flyout.Popup);
+                Assert.NotNull(popup.Parent);
+                
+                flyout.Hide();
+                
+                flyout.ShowAt(userControl);
+                Assert.NotNull(popup.Parent);
+            }
+        }
 
         [Fact]
         public void ContextFlyout_Can_Be_Set_In_Styles()

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs

@@ -628,11 +628,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
              xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Window.Styles>
         <Style Selector='Border'>
-            <Style.Children>
-                <Style Selector='^.foo'>
-                    <Setter Property='Background' Value='Red'/>
-                </Style>
-            </Style.Children>
+            <Style Selector='^.foo'>
+                <Setter Property='Background' Value='Red'/>
+            </Style>
         </Style>
     </Window.Styles>
     <StackPanel>