From 2e8561e6b80669f3e95997cc20602592bcbd54b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ansel?= Date: Mon, 25 Nov 2024 17:54:03 +0100 Subject: [PATCH 1/2] Fix ikw namespace in xaml --- samples/Acrylic10Example/MainWindow.xaml | 1 + samples/Acrylic10Example/MainWindow.xaml.cs | 22 +++++++++---------- samples/ExamplePhotoTaker/MainWindow.xaml | 4 ++-- .../WinUIResourcesConverter/MainWindow.xaml | 17 +++++++------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/samples/Acrylic10Example/MainWindow.xaml b/samples/Acrylic10Example/MainWindow.xaml index ecc9ac80..f283bb36 100644 --- a/samples/Acrylic10Example/MainWindow.xaml +++ b/samples/Acrylic10Example/MainWindow.xaml @@ -5,6 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Acrylic10Example" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" + xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" ui:WindowHelper.UseModernWindowStyle="True" ui:TitleBar.Height="36" mc:Ignorable="d" diff --git a/samples/Acrylic10Example/MainWindow.xaml.cs b/samples/Acrylic10Example/MainWindow.xaml.cs index 2ab63bd5..46aef6f9 100644 --- a/samples/Acrylic10Example/MainWindow.xaml.cs +++ b/samples/Acrylic10Example/MainWindow.xaml.cs @@ -27,19 +27,19 @@ public MainWindow() private void Window_Loaded(object sender, RoutedEventArgs e) { - WindowChrome.SetWindowChrome(this, new WindowChrome() - { - GlassFrameThickness = new Thickness(0, 1, 0, 0), - UseAeroCaptionButtons = false, - CornerRadius = new CornerRadius(0), - ResizeBorderThickness = new Thickness(4), - NonClientFrameEdges = NonClientFrameEdges.None, - CaptionHeight = 36d, + //WindowChrome.SetWindowChrome(this, new WindowChrome() + //{ + // GlassFrameThickness = new Thickness(0, 1, 0, 0), + // UseAeroCaptionButtons = false, + // CornerRadius = new CornerRadius(0), + // ResizeBorderThickness = new Thickness(4), + // NonClientFrameEdges = NonClientFrameEdges.None, + // CaptionHeight = 36d, - }); + //}); - WindowHelper.SetApplyBackground(this, false); - AcrylicHelper.Apply(this, true); + //WindowHelper.SetApplyBackground(this, false); + //AcrylicHelper.Apply(this, true); } } } \ No newline at end of file diff --git a/samples/ExamplePhotoTaker/MainWindow.xaml b/samples/ExamplePhotoTaker/MainWindow.xaml index e619eb54..8c977fe2 100644 --- a/samples/ExamplePhotoTaker/MainWindow.xaml +++ b/samples/ExamplePhotoTaker/MainWindow.xaml @@ -23,10 +23,10 @@ - - + diff --git a/source/tools/WinUIResourcesConverter/MainWindow.xaml b/source/tools/WinUIResourcesConverter/MainWindow.xaml index e3be2ad8..609760d9 100644 --- a/source/tools/WinUIResourcesConverter/MainWindow.xaml +++ b/source/tools/WinUIResourcesConverter/MainWindow.xaml @@ -6,6 +6,7 @@ xmlns:local="clr-namespace:WinUIResourcesConverter" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" + xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" Title="WinUI Resources Converter" Width="800" Height="450" @@ -23,12 +24,12 @@ IsPaneOpen="True" PanePlacement="Left"> - - + @@ -50,8 +51,8 @@ local WinUI repo clone that you want to the convert the resources for - - + + @@ -71,8 +72,8 @@ Strings directory of the target control that you want to the convert the resources for - - + @@ -85,8 +86,8 @@ Click="ConvertButton_Click" Content="Convert" Style="{DynamicResource AccentButtonStyle}" /> - - + + Date: Tue, 26 Nov 2024 11:44:54 +0800 Subject: [PATCH 2/2] Clean some bullsh1t --- samples/Acrylic10Example/MainWindow.xaml | 1 + samples/Acrylic10Example/MainWindow.xaml.cs | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/samples/Acrylic10Example/MainWindow.xaml b/samples/Acrylic10Example/MainWindow.xaml index f283bb36..cf247bc9 100644 --- a/samples/Acrylic10Example/MainWindow.xaml +++ b/samples/Acrylic10Example/MainWindow.xaml @@ -7,6 +7,7 @@ xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" ui:WindowHelper.UseModernWindowStyle="True" + ui:WindowHelper.SystemBackdropType="Acrylic10" ui:TitleBar.Height="36" mc:Ignorable="d" Title="Welcome!" Height="450" Width="800" diff --git a/samples/Acrylic10Example/MainWindow.xaml.cs b/samples/Acrylic10Example/MainWindow.xaml.cs index 46aef6f9..4d93872e 100644 --- a/samples/Acrylic10Example/MainWindow.xaml.cs +++ b/samples/Acrylic10Example/MainWindow.xaml.cs @@ -27,19 +27,7 @@ public MainWindow() private void Window_Loaded(object sender, RoutedEventArgs e) { - //WindowChrome.SetWindowChrome(this, new WindowChrome() - //{ - // GlassFrameThickness = new Thickness(0, 1, 0, 0), - // UseAeroCaptionButtons = false, - // CornerRadius = new CornerRadius(0), - // ResizeBorderThickness = new Thickness(4), - // NonClientFrameEdges = NonClientFrameEdges.None, - // CaptionHeight = 36d, - //}); - - //WindowHelper.SetApplyBackground(this, false); - //AcrylicHelper.Apply(this, true); } } } \ No newline at end of file