From 05fc61d92fa0f440092fc57aad13f97ffebcf79e Mon Sep 17 00:00:00 2001
From: chinboy <chinware@163.com>
Date: Tue, 29 Jul 2025 14:54:27 +0800
Subject: [PATCH] Fix fullscreen bug

---
 .../Chrome/CaptionButtonGroup.cs              | 28 +++++++++----------
 .../FullScreenButtonVisibleConverter.cs       | 18 ++++++++++++
 .../Chrome/Themes/CaptionButtonGroup.axaml    | 12 ++++++--
 src/AtomUI.Controls/Window/Window.cs          | 16 +++++------
 4 files changed, 50 insertions(+), 24 deletions(-)
 create mode 100644 src/AtomUI.Controls/Chrome/Converters/FullScreenButtonVisibleConverter.cs

diff --git a/src/AtomUI.Controls/Chrome/CaptionButtonGroup.cs b/src/AtomUI.Controls/Chrome/CaptionButtonGroup.cs
index 16a8dfa93..c55830daa 100644
--- a/src/AtomUI.Controls/Chrome/CaptionButtonGroup.cs
+++ b/src/AtomUI.Controls/Chrome/CaptionButtonGroup.cs
@@ -14,16 +14,16 @@ public class CaptionButtonGroup : TemplatedControl
     #region 公共属性定义
 
     public static readonly StyledProperty<bool> IsFullScreenEnabledProperty =
-        AvaloniaProperty.Register<Window, bool>(nameof(IsFullScreenEnabled), true);
-
+        Window.IsFullScreenEnabledProperty.AddOwner<CaptionButtonGroup>();
+    
     public static readonly StyledProperty<bool> IsMaximizeEnabledProperty =
-        AvaloniaProperty.Register<Window, bool>(nameof(IsMaximizeEnabled), defaultValue: true);
-
+        Window.IsMaximizeEnabledProperty.AddOwner<CaptionButtonGroup>();
+    
     public static readonly StyledProperty<bool> IsMinimizeEnabledProperty =
-        AvaloniaProperty.Register<Window, bool>(nameof(IsMinimizeEnabled), defaultValue: true);
-
+        Window.IsMinimizeEnabledProperty.AddOwner<CaptionButtonGroup>();
+    
     public static readonly StyledProperty<bool> IsPinEnabledProperty =
-        AvaloniaProperty.Register<Window, bool>(nameof(IsPinEnabled), true);
+        Window.IsPinEnabledProperty.AddOwner<CaptionButtonGroup>();
     
     public static readonly StyledProperty<bool> IsWindowActiveProperty = 
         TitleBar.IsWindowActiveProperty.AddOwner<CaptionButtonGroup>();
@@ -143,7 +143,11 @@ public class CaptionButtonGroup : TemplatedControl
             return;
         }
            
-        HostWindow = hostWindow;
+        HostWindow                         = hostWindow;
+        this[!IsFullScreenEnabledProperty] = hostWindow[!IsFullScreenEnabledProperty];
+        this[!IsPinEnabledProperty]        = hostWindow[!IsPinEnabledProperty];
+        this[!IsMaximizeEnabledProperty]   = hostWindow[!IsMaximizeEnabledProperty];
+        this[!IsMinimizeEnabledProperty]   = hostWindow[!IsMinimizeEnabledProperty];
         _disposables = new CompositeDisposable
         {
             HostWindow.GetObservable(Window.WindowStateProperty)
@@ -229,15 +233,11 @@ public class CaptionButtonGroup : TemplatedControl
             return;
         }
 
-        if (!_isWindowFullScreen)
+        if (!IsWindowFullScreen)
         {
             _originWindowState = HostWindow.WindowState;
         }
-        else
-        {
-            HostWindow.WindowState = WindowState.FullScreen;
-        }
-        HostWindow.WindowState = _isWindowFullScreen
+        HostWindow.WindowState = IsWindowFullScreen
             ? _originWindowState ?? WindowState.Normal
             : WindowState.FullScreen;
         IsWindowFullScreen = HostWindow.WindowState == WindowState.FullScreen;
diff --git a/src/AtomUI.Controls/Chrome/Converters/FullScreenButtonVisibleConverter.cs b/src/AtomUI.Controls/Chrome/Converters/FullScreenButtonVisibleConverter.cs
new file mode 100644
index 000000000..1b4e6ac83
--- /dev/null
+++ b/src/AtomUI.Controls/Chrome/Converters/FullScreenButtonVisibleConverter.cs
@@ -0,0 +1,18 @@
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace AtomUI.Controls.Converters;
+
+internal class FullScreenButtonVisibleConverter : IMultiValueConverter
+{
+    public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (values.Count != 2)
+        {
+            return false;
+        }
+        var isFullScreenEnabled = values[0] as bool?;
+        var isMaximized         = values[1] as bool?;
+        return isFullScreenEnabled == true && isMaximized != true;
+    }
+}
\ No newline at end of file
diff --git a/src/AtomUI.Controls/Chrome/Themes/CaptionButtonGroup.axaml b/src/AtomUI.Controls/Chrome/Themes/CaptionButtonGroup.axaml
index f6b99bd7f..603a3bde4 100644
--- a/src/AtomUI.Controls/Chrome/Themes/CaptionButtonGroup.axaml
+++ b/src/AtomUI.Controls/Chrome/Themes/CaptionButtonGroup.axaml
@@ -6,19 +6,27 @@
     x:ClassModifier="internal">
     <converters:MaximizeButtonVisibleConverter x:Key="MaximizeButtonVisibleConverter" />
     <converters:MinimizeButtonVisibleConverter x:Key="MinimizeButtonVisibleConverter" />
+    <converters:FullScreenButtonVisibleConverter x:Key="FullScreenButtonVisibleConverter"/>
     <ControlTheme x:Key="{x:Type atom:CaptionButtonGroup}" TargetType="atom:CaptionButtonGroup">
         <Setter Property="Template">
             <ControlTemplate>
                 <StackPanel Orientation="Horizontal" Name="RootLayout">
                     <atom:CaptionButton
                         Name="{x:Static atom:CaptionButtonGroupThemeConstants.FullScreenButtonPart}"
-                        IsVisible="{TemplateBinding IsFullScreenEnabled}"
                         IsEnabled="{TemplateBinding IsFullScreenEnabled}"
                         IsWindowActive="{TemplateBinding IsWindowActive}"
                         NormalIcon="{atom:IconProvider Kind=FullscreenOutlined}"
                         CheckedIcon="{atom:IconProvider Kind=FullscreenExitOutlined}"
                         IsMotionEnabled="{TemplateBinding IsMotionEnabled}"
-                        IsChecked="{TemplateBinding IsWindowFullScreen}" />
+                        IsChecked="{TemplateBinding IsWindowFullScreen}">
+                        <atom:CaptionButton.IsVisible>
+                            <MultiBinding
+                                Converter="{StaticResource FullScreenButtonVisibleConverter}">
+                                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="IsFullScreenEnabled" />
+                                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="IsWindowMaximized" />
+                            </MultiBinding>
+                        </atom:CaptionButton.IsVisible>
+                    </atom:CaptionButton>
                     <atom:CaptionButton
                         Name="{x:Static atom:CaptionButtonGroupThemeConstants.PinButtonPart}"
                         IsVisible="{TemplateBinding IsPinEnabled}"
diff --git a/src/AtomUI.Controls/Window/Window.cs b/src/AtomUI.Controls/Window/Window.cs
index d18d9d1b0..30e776373 100644
--- a/src/AtomUI.Controls/Window/Window.cs
+++ b/src/AtomUI.Controls/Window/Window.cs
@@ -16,7 +16,7 @@ using AvaloniaWindow = Avalonia.Controls.Window;
 
 public class Window : AvaloniaWindow, IDisposable
 {
-    #region 公共属性
+    #region 公共属性定义
 
     public static readonly StyledProperty<bool> IsTitleBarVisibleProperty =
         AvaloniaProperty.Register<Window, bool>(nameof(IsTitleBarVisible), defaultValue: true);
@@ -40,16 +40,16 @@ public class Window : AvaloniaWindow, IDisposable
         TitleBar.LogoProperty.AddOwner<Window>();
     
     public static readonly StyledProperty<bool> IsFullScreenEnabledProperty =
-        CaptionButtonGroup.IsFullScreenEnabledProperty.AddOwner<Window>();
-    
+        AvaloniaProperty.Register<Window, bool>(nameof(IsFullScreenEnabled));
+
     public static readonly StyledProperty<bool> IsMaximizeEnabledProperty =
-        CaptionButtonGroup.IsMaximizeEnabledProperty.AddOwner<Window>();
-    
+        AvaloniaProperty.Register<Window, bool>(nameof(IsMaximizeEnabled), defaultValue: true);
+
     public static readonly StyledProperty<bool> IsMinimizeEnabledProperty =
-        CaptionButtonGroup.IsMinimizeEnabledProperty.AddOwner<Window>();
-    
+        AvaloniaProperty.Register<Window, bool>(nameof(IsMinimizeEnabled), defaultValue: true);
+
     public static readonly StyledProperty<bool> IsPinEnabledProperty =
-        CaptionButtonGroup.IsPinEnabledProperty.AddOwner<Window>();
+        AvaloniaProperty.Register<Window, bool>(nameof(IsPinEnabled));
     
     public static readonly StyledProperty<bool> IsMoveEnabledProperty =
         AvaloniaProperty.Register<Window, bool>(nameof(IsMoveEnabled), defaultValue: true);