diff --git a/Directory.Build.props b/Directory.Build.props index 7a48419..ae6e20b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,11 +2,11 @@ - net472;netcoreapp3.1;net5.0-windows + net8.0-windows;net6.0-windows;net462 true true false - 9.0 + 10.0 true full true @@ -20,8 +20,8 @@ - - + + diff --git a/Directory.Packages.props b/Directory.Packages.props index 06e842d..93aecb2 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,19 +1,19 @@ - - + + all runtime; build; native; contentfiles; analyzers - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/ListViewSwitchItemsPanel/ListViewSample_ffi3tk3x_wpftmp.csproj b/ListViewSwitchItemsPanel/ListViewSample_ffi3tk3x_wpftmp.csproj new file mode 100644 index 0000000..10c5ba2 --- /dev/null +++ b/ListViewSwitchItemsPanel/ListViewSample_ffi3tk3x_wpftmp.csproj @@ -0,0 +1,227 @@ + + + ListViewSample + obj\Debug\ + obj\ + D:\source\github\code-samples\ListViewSwitchItemsPanel\obj\ + <_TargetAssemblyProjectName>ListViewSample + + + + WinExe + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MahAppsMetroDataGridSample/MainWindow.xaml b/MahAppsMetroDataGridSample/MainWindow.xaml index 4a2b456..6e60380 100644 --- a/MahAppsMetroDataGridSample/MainWindow.xaml +++ b/MahAppsMetroDataGridSample/MainWindow.xaml @@ -8,7 +8,7 @@ Title="MahApps.Metro DataGrid Sample" Width="670" Height="350" - GlowBrush="{DynamicResource MahApps.Brushes.Accent}" + GlowColor="{DynamicResource MahApps.Colors.Accent}" mc:Ignorable="d"> diff --git a/MahAppsMetroFullScreen/MainWindow.xaml b/MahAppsMetroFullScreen/MainWindow.xaml index 7feb845..6407b9f 100644 --- a/MahAppsMetroFullScreen/MainWindow.xaml +++ b/MahAppsMetroFullScreen/MainWindow.xaml @@ -6,11 +6,8 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="MainWindow" BorderThickness="1" - GlowBrush="{DynamicResource MahApps.Brushes.AccentBase}" + GlowColor="{DynamicResource MahApps.Colors.AccentBase}" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - UseNoneWindowStyle="True" - IgnoreTaskbarOnMaximize="True" Width="525" Height="350" mc:Ignorable="d"> diff --git a/MahAppsMetroFullScreen/MainWindow.xaml.cs b/MahAppsMetroFullScreen/MainWindow.xaml.cs index b9d7724..40baff0 100644 --- a/MahAppsMetroFullScreen/MainWindow.xaml.cs +++ b/MahAppsMetroFullScreen/MainWindow.xaml.cs @@ -11,20 +11,24 @@ public partial class MainWindow : MetroWindow public MainWindow() { InitializeComponent(); + this.Loaded += MainWindow_Loaded; + } + + private void MainWindow_Loaded(object sender, RoutedEventArgs e) + { + this.SetCurrentValue(WindowStateProperty, WindowState.Maximized); + this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, true); } private void FullClick(object sender, RoutedEventArgs e) { this.SetCurrentValue(WindowStateProperty, WindowState.Maximized); - this.SetCurrentValue(UseNoneWindowStyleProperty, true); this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, true); } private void NormalClick(object sender, RoutedEventArgs e) { this.SetCurrentValue(WindowStateProperty, WindowState.Normal); - this.SetCurrentValue(UseNoneWindowStyleProperty, false); - this.SetCurrentValue(ShowTitleBarProperty, true); // <-- this must be set to true this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, false); } } diff --git a/MahAppsMetroHamburgerMenuNavigation/MainWindow.xaml b/MahAppsMetroHamburgerMenuNavigation/MainWindow.xaml index a2503cb..e994999 100644 --- a/MahAppsMetroHamburgerMenuNavigation/MainWindow.xaml +++ b/MahAppsMetroHamburgerMenuNavigation/MainWindow.xaml @@ -9,7 +9,7 @@ Title="MainWindow" Width="600" Height="450" - GlowBrush="{DynamicResource MahApps.Brushes.AccentBase}" + GlowColor="{DynamicResource MahApps.Colors.AccentBase}" WindowStartupLocation="CenterScreen" WindowTransitionsEnabled="False" mc:Ignorable="d"> diff --git a/MahAppsMetroSample/MahAppsMetroSample_phlauzip_wpftmp.csproj b/MahAppsMetroSample/MahAppsMetroSample_phlauzip_wpftmp.csproj new file mode 100644 index 0000000..11d4a55 --- /dev/null +++ b/MahAppsMetroSample/MahAppsMetroSample_phlauzip_wpftmp.csproj @@ -0,0 +1,247 @@ + + + MahAppsMetroSample + obj\Debug\ + obj\ + D:\source\github\code-samples\MahAppsMetroSample\obj\ + <_TargetAssemblyProjectName>MahAppsMetroSample + + + + WinExe + app.manifest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MahAppsMetroSample/MainWindow.xaml b/MahAppsMetroSample/MainWindow.xaml index 66d3bc5..1d846b1 100644 --- a/MahAppsMetroSample/MainWindow.xaml +++ b/MahAppsMetroSample/MainWindow.xaml @@ -7,7 +7,7 @@ Title="MainWindow" Width="525" Height="350" - GlowBrush="Black"> + GlowColor="Black"> diff --git a/MahAppsMetroSample/MainWindow.xaml.cs b/MahAppsMetroSample/MainWindow.xaml.cs index a24a4c7..249ed02 100644 --- a/MahAppsMetroSample/MainWindow.xaml.cs +++ b/MahAppsMetroSample/MainWindow.xaml.cs @@ -36,8 +36,7 @@ private void ButtonBase_OnClick(object sender, EventArgs e) { var w = new MetroWindow { - GlowBrush = Brushes.Gray, - BorderThickness = new Thickness(1), + GlowColor = Colors.Gray, Title = "Modal", Width = 300, Height = 200, @@ -61,7 +60,7 @@ private static void OnToggleFullScreenChanged(DependencyObject dependencyObject, var fullScreen = (bool)e.NewValue; if (fullScreen) { - metroWindow.UseNoneWindowStyle = true; + metroWindow.WindowStyle = WindowStyle.None; metroWindow.IgnoreTaskbarOnMaximize = true; metroWindow.ShowMinButton = false; metroWindow.ShowMaxRestoreButton = false; @@ -70,7 +69,7 @@ private static void OnToggleFullScreenChanged(DependencyObject dependencyObject, } else { - metroWindow.UseNoneWindowStyle = false; + metroWindow.WindowStyle = WindowStyle.SingleBorderWindow; metroWindow.ShowTitleBar = true; // <-- this must be set to true metroWindow.IgnoreTaskbarOnMaximize = false; metroWindow.ShowMinButton = true; diff --git a/MahAppsMetroStyleOnlyWindowSample/CleanWindow.xaml b/MahAppsMetroStyleOnlyWindowSample/CleanWindow.xaml index 8ce7bb4..1d13ab2 100644 --- a/MahAppsMetroStyleOnlyWindowSample/CleanWindow.xaml +++ b/MahAppsMetroStyleOnlyWindowSample/CleanWindow.xaml @@ -5,7 +5,7 @@ Title="CleanWindow" Height="300" Width="600" - GlowBrush="{DynamicResource MahApps.Brushes.Accent}" + GlowColor="{DynamicResource MahApps.Colors.Accent}" Style="{DynamicResource MahApps.Styles.MetroWindow.Clean}"> diff --git a/MahAppsMetroThemesSample/AccentStyleWindow.xaml b/MahAppsMetroThemesSample/AccentStyleWindow.xaml index 79b5b00..d13fa3f 100644 --- a/MahAppsMetroThemesSample/AccentStyleWindow.xaml +++ b/MahAppsMetroThemesSample/AccentStyleWindow.xaml @@ -9,7 +9,7 @@ TextOptions.TextFormattingMode="Display" Title="Change App Style" SizeToContent="WidthAndHeight" - GlowBrush="{DynamicResource MahApps.Brushes.Accent}" + GlowColor="{DynamicResource MahApps.Colors.Accent}" ResizeMode="CanResizeWithGrip"> diff --git a/MahAppsMetroThemesSample/App.xaml.cs b/MahAppsMetroThemesSample/App.xaml.cs index 27537da..26afb4d 100644 --- a/MahAppsMetroThemesSample/App.xaml.cs +++ b/MahAppsMetroThemesSample/App.xaml.cs @@ -26,6 +26,9 @@ protected override void OnStartup(StartupEventArgs e) ThemeManager.Current.AddLibraryTheme(new LibraryTheme( new Uri("pack://application:,,,/MahAppsMetroThemesSample;component/CustomAccents/Dark.Accent2.xaml"), MahAppsLibraryThemeProvider.DefaultInstance)); + ThemeManager.Current.AddLibraryTheme(new LibraryTheme( + new Uri("pack://application:,,,/MahAppsMetroThemesSample;component/CustomAccents/AccentColor.Light.Clean.xaml"), + MahAppsLibraryThemeProvider.DefaultInstance)); base.OnStartup(e); diff --git a/MahAppsMetroThemesSample/CustomAccents/AccentColor.Light.Clean.xaml b/MahAppsMetroThemesSample/CustomAccents/AccentColor.Light.Clean.xaml new file mode 100644 index 0000000..f8506fc --- /dev/null +++ b/MahAppsMetroThemesSample/CustomAccents/AccentColor.Light.Clean.xaml @@ -0,0 +1,519 @@ + + + + Light.CoolApp + MahApps.Metro + CoolApp (Light) + Light + CoolApp + #FF4D4D4D + + + + + + + + #FF0078B5 + #FFFF0000 + #FF4D4D4D + + #CC4D4D4D + + #994D4D4D + + #664D4D4D + + #334D4D4D + + + #FF000000 + #FFFFFFFF + #FFFFFFFF + + #FF333333 + #FF7F7F7F + #FF9D9D9D + #FFA59F93 + #FFB9B9B9 + #FFCCCCCC + #FFD8D8D9 + #FFE0E0E0 + #5EC9C9C9 + #FFF7F7F7 + + #FFBEBEBE + #FF333333 + #40808080 + + #FFFFFFFF + + + #33878787 + #33959595 + #4C000000 + #4C000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #FF000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + #FF4D4D4D + + #FFFFFFFF + #33FFFFFF + #99FFFFFF + #CCFFFFFF + #66FFFFFF + #FF000000 + #33000000 + #99000000 + #CC000000 + #66000000 + #FF171717 + #FF000000 + #33000000 + #66000000 + #CC000000 + #FFCCCCCC + #FF7A7A7A + #FFCCCCCC + #FFF2F2F2 + #FFE6E6E6 + #FFF2F2F2 + #FFFFFFFF + #FF767676 + #19000000 + #33000000 + #C50500 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MahAppsMetroThemesSample/MainWindow.xaml b/MahAppsMetroThemesSample/MainWindow.xaml index b2ca019..380277a 100644 --- a/MahAppsMetroThemesSample/MainWindow.xaml +++ b/MahAppsMetroThemesSample/MainWindow.xaml @@ -7,7 +7,7 @@ Width="600" Height="250" TitleCharacterCasing="Normal" - GlowBrush="{DynamicResource MahApps.Brushes.Accent}" + GlowColor="{DynamicResource MahApps.Colors.Accent}" RenderOptions.ClearTypeHint="Enabled" ResizeMode="CanResizeWithGrip" TextOptions.TextFormattingMode="Display" diff --git a/MahAppsMetroWindowButtonCommands/MahAppsMetroWindowButtonCommands_2v3qvggt_wpftmp.csproj b/MahAppsMetroWindowButtonCommands/MahAppsMetroWindowButtonCommands_2v3qvggt_wpftmp.csproj new file mode 100644 index 0000000..e795ed3 --- /dev/null +++ b/MahAppsMetroWindowButtonCommands/MahAppsMetroWindowButtonCommands_2v3qvggt_wpftmp.csproj @@ -0,0 +1,240 @@ + + + MahAppsMetroWindowButtonCommands + obj\Debug\ + obj\ + D:\source\github\code-samples\MahAppsMetroWindowButtonCommands\obj\ + <_TargetAssemblyProjectName>MahAppsMetroWindowButtonCommands + + + + WinExe + app.manifest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MahAppsMetroWindowButtonCommands/MainWindow.xaml b/MahAppsMetroWindowButtonCommands/MainWindow.xaml index 4fa05b4..28500c1 100644 --- a/MahAppsMetroWindowButtonCommands/MainWindow.xaml +++ b/MahAppsMetroWindowButtonCommands/MainWindow.xaml @@ -4,10 +4,11 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:controlzex="urn:controlzex" mc:Ignorable="d" ResizeMode="CanResizeWithGrip" Title="MainWindow" Height="350" Width="525" BorderThickness="1" - GlowBrush="{DynamicResource MahApps.Brushes.AccentBase}" + GlowColor="{DynamicResource MahApps.Colors.AccentBase}" WindowStartupLocation="CenterScreen"> @@ -23,6 +24,13 @@ + + + + + + + @@ -52,6 +67,14 @@ + + + + + + + + @@ -80,6 +111,13 @@ + + + + + + + - + \ No newline at end of file diff --git a/global.json b/global.json index dfc81e0..81e632a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { - "sdk": { - "version": "5.0.400", - "rollForward": "latestFeature" - } + "sdk": { + "version": "8.0.100", + "rollForward": "feature", + "allowPrerelease": false + } } \ No newline at end of file