Fixed crash clicking maximize button with ResizeMode = CanMinimize

iNKORE-NET · Oct 6, 2023 · f6bdef3 · f6bdef3
1 parent cd21355
commit f6bdef3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Primitives/WindowHelper.cs b/source/iNKORE.UI.WPF.Modern/Controls/Primitives/WindowHelper.cs
@@ -239,21 +239,18 @@ public static void SetCornerStyle(Window window, WindowCornerStyle value)
 
         #region FixMaximizedWindow
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly DependencyProperty FixMaximizedWindowProperty =
             DependencyProperty.RegisterAttached(
                 "FixMaximizedWindow",
                 typeof(bool),
                 typeof(WindowHelper),
                 new PropertyMetadata(false, OnFixMaximizedWindowChanged));
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static bool GetFixMaximizedWindow(Window window)
         {
             return (bool)window.GetValue(FixMaximizedWindowProperty);
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static void SetFixMaximizedWindow(Window window, bool value)
         {
             window.SetValue(FixMaximizedWindowProperty, value);

diff --git a/source/iNKORE.UI.WPF.Modern/TitleBar/SnapLayout.cs b/source/iNKORE.UI.WPF.Modern/TitleBar/SnapLayout.cs
@@ -162,7 +162,7 @@ private bool IsOverButton(IntPtr wParam, IntPtr lParam)
 
         private void RaiseButtonClick()
         {
-            if (new ButtonAutomationPeer(_button).GetPattern(PatternInterface.Invoke) is IInvokeProvider invokeProv)
+            if (_button.IsEnabled && new ButtonAutomationPeer(_button).GetPattern(PatternInterface.Invoke) is IInvokeProvider invokeProv)
                 invokeProv?.Invoke();
         }
 

diff --git a/source/samples/WpfApp1/MainWindow.xaml b/source/samples/WpfApp1/MainWindow.xaml
@@ -6,12 +6,13 @@
         xmlns:local="clr-namespace:WpfApp1" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800"
+        ResizeMode="CanMinimize"
         ui:ThemeManager.IsThemeAware="True" ui:TitleBar.Height="40"
      ui:TitleBar.ExtendViewIntoTitleBar="False"   
      ui:WindowHelper.SystemBackdropType="Mica"
      ui:TitleBar.IsBackButtonVisible="False"
      ui:WindowHelper.UseModernWindowStyle="True"
-        ui:WindowHelper.CornerStyle="RoundSmall">
+        ui:WindowHelper.CornerStyle="DoNotRound" Background="{x:Null}">
     <Grid>
         <ComboBox SelectionChanged="ComboBox_SelectionChanged" Height="35">
             <ComboBoxItem Content="Item1"/>