diff --git a/.editorconfig b/.editorconfig index 59efe81..c2f2e6d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,10 @@ root = true +# Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10855 +[XamlTypeInfo.g.cs] +dotnet_diagnostic.CS0612.severity = none +dotnet_diagnostic.CS0618.severity = none + # All files [*] indent_style = space diff --git a/Assets/Logo/app_128.ico b/Assets/Logo/app_128.ico new file mode 100644 index 0000000..2657dca Binary files /dev/null and b/Assets/Logo/app_128.ico differ diff --git a/Assets/Logo/app_64.ico b/Assets/Logo/app_64.ico new file mode 100644 index 0000000..ba37fd1 Binary files /dev/null and b/Assets/Logo/app_64.ico differ diff --git a/Assets/Logo/app_64.png b/Assets/Logo/app_64.png new file mode 100644 index 0000000..a840f80 Binary files /dev/null and b/Assets/Logo/app_64.png differ diff --git a/MainWindow.xaml b/MainWindow.xaml index 406e920..61747ca 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -4,15 +4,23 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="using:MyApp" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:winex="using:WinUIEx" + Title="MainWindow" mc:Ignorable="d"> - - Pure WinUI3 - None - + + + + + + + + + + + + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 4badf3a..35994a4 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -5,10 +5,9 @@ public sealed partial class MainWindow : WindowEx { public MainWindow() { - this.InitializeComponent(); - this.SetIcon("Assets/Logo/app.ico"); - Title = "Pure"; - Width = 600; - Height = 480; + InitializeComponent(); + this.SetIcon("Assets/Logo/app_64.ico"); + ExtendsContentIntoTitleBar = true; + SetTitleBar(AppTitleBar); } } \ No newline at end of file diff --git a/PureWinUI.csproj b/PureWinUI.csproj index ee4a0ea..68d3214 100644 --- a/PureWinUI.csproj +++ b/PureWinUI.csproj @@ -27,7 +27,4 @@ - - - \ No newline at end of file