Merge pull request #316 from lepoco/revert-303-main

Revert "Added Titlebar Property to set the Close button visibility"
lepoco · Jul 30, 2022 · 6212d26 · 6212d26
2 parents 1ae7f60 + cfd1b78
commit 6212d26
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -109,13 +109,6 @@ public class TitleBar : System.Windows.Controls.Control, IThemeControl
         nameof(ShowMinimize),
         typeof(bool), typeof(TitleBar), new PropertyMetadata(true));
 
-    /// <summary>
-    /// Property for <see cref="ShowClose"/>.
-    /// </summary>
-    public static readonly DependencyProperty ShowCloseProperty = DependencyProperty.Register(
-        nameof(ShowClose),
-        typeof(bool), typeof(TitleBar), new PropertyMetadata(true));
-
     /// <summary>
     /// Property for <see cref="ShowHelp"/>
     /// </summary>
@@ -273,16 +266,7 @@ public bool ShowMinimize
         get => (bool)GetValue(ShowMinimizeProperty);
         set => SetValue(ShowMinimizeProperty, value);
     }
-
-    /// <summary>
-    /// Gets or sets information whether to show close button.
-    /// </summary>
-    public bool ShowClose
-    {
-        get => (bool)GetValue(ShowCloseProperty);
-        set => SetValue(ShowCloseProperty, value);
-    }
-
+
     /// <summary>
     /// Gets or sets information whether to show help button
     /// </summary>

diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -250,8 +250,6 @@
                                 </controls:Button>
                                 <controls:Button
                                     Grid.Column="4"
-                                    x:Name="PART_CloseButton"
-                                    Visibility="Collapsed"
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="close"
                                     KeyboardNavigation.IsTabStop="True"
@@ -274,9 +272,6 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
                         </MultiTrigger>
-                        <Trigger Property="ShowClose" Value="True">
-                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
-                        </Trigger>
                         <Trigger Property="Theme" Value="Dark">
                             <Setter Property="ButtonsBackground">
                                 <Setter.Value>