feat: MahApps#4362 adapt window to new controlzex window chrome version

michaelmairegger · Feb 2, 2023 · 5da313e · 5da313e
1 parent 7b50db6
commit 5da313e
Show file tree

Hide file tree

Showing 4 changed files with 392 additions and 402 deletions.
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/ShellView.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/ShellView.xaml
@@ -8,8 +8,6 @@
                  Title="Flyouts Demo"
                  Width="800"
                  Height="600"
-                 BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
-                 BorderThickness="1"
                  SaveWindowPosition="True"
                  WindowStartupLocation="CenterScreen"
                  mc:Ignorable="d">

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -14,8 +14,6 @@
                  MinWidth="700"
                  MinHeight="500"
                  d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
-                 BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
-                 BorderThickness="1"
                  IconOverlayBehavior="Never"
                  SaveWindowPosition="True"
                  TitleCharacterCasing="Normal"
@@ -499,7 +497,12 @@
                           SelectedValue="{Binding ElementName=ThisView, Path=IconOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
 
-            <CheckBox Content="ShowTitleBar" IsChecked="{Binding ElementName=ThisView, Path=ShowTitleBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            <CheckBox Content="ShowTitleBar"
+                      IsChecked="{Binding ElementName=ThisView, Path=ShowTitleBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                      Style="{StaticResource MahApps.Styles.CheckBox.Win10}" />
+            <CheckBox Content="IsWindowDraggable"
+                      IsChecked="{Binding ElementName=ThisView, Path=IsWindowDraggable, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                      Style="{StaticResource MahApps.Styles.CheckBox.Win10}" />
 
             <Button Margin="2 10 2 2"
                     Click="ShowLeft"

diff --git a/src/MahApps.Metro/Controls/MetroWindow.cs b/src/MahApps.Metro/Controls/MetroWindow.cs
@@ -1239,12 +1239,12 @@ private void MetroWindow_SizeChanged(object sender, RoutedEventArgs e)
             {
                 this.titleBar.SetCurrentValue(MarginProperty, default(Thickness));
                 Grid.SetColumn(this.titleBar, 0);
-                Grid.SetColumnSpan(this.titleBar, 5);
+                Grid.SetColumnSpan(this.titleBar, 3);
             }
             else
             {
                 this.titleBar.SetCurrentValue(MarginProperty, new Thickness(leftWindowCommandsWidth, 0, rightWindowCommandsWidth, 0));
-                Grid.SetColumn(this.titleBar, 2);
+                Grid.SetColumn(this.titleBar, 1);
                 Grid.SetColumnSpan(this.titleBar, 1);
             }
         }