Skip to content

Commit e364336

Browse files
Jack251970Jack251970
committed
Revert "Test"
This reverts commit 9c4b613.
1 parent 16357d3 commit e364336

File tree

3 files changed

+79
-139
lines changed

3 files changed

+79
-139
lines changed

‎source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
using System.Windows.Data;
1919
using System.Windows.Interop;
2020
using System.Threading;
21-
using iNKORE.UI.WPF.Modern.Gallery.SamplePages;
2221

2322
namespace iNKORE.UI.WPF.Modern.Gallery
2423
{
@@ -28,13 +27,9 @@ public partial class MainWindow : Window
2827

2928
public MainWindow()
3029
{
31-
var window = new SampleSystemBackdropsWindow();
32-
window.Show();
33-
3430
Current = this;
3531
InitializeComponent();
36-
/*InitialzeApp();*/
37-
Close();
32+
InitialzeApp();
3833
}
3934

4035
private async void InitialzeApp()

‎source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleSystemBackdropsWindow.xaml‎

Lines changed: 20 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2,86 +2,32 @@
22
x:Class="iNKORE.UI.WPF.Modern.Gallery.SamplePages.SampleSystemBackdropsWindow"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:controls="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls"
65
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7-
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
8-
xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
6+
xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.SamplePages"
97
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
10-
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
8+
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
119
Title="System Backdrops Window"
12-
Width="700"
10+
Width="800"
1311
Height="450"
14-
ui:ThemeManager.IsThemeAware="True"
15-
ui:TitleBar.ExtendViewIntoTitleBar="True"
16-
ui:TitleBar.Height="48"
1712
ui:WindowHelper.SystemBackdropType="Mica"
13+
ui:WindowHelper.UseAcrylicBackdrop="True"
14+
ui:WindowHelper.UseAeroBackdrop="True"
1815
ui:WindowHelper.UseModernWindowStyle="True"
19-
WindowStartupLocation="CenterScreen"
2016
mc:Ignorable="d">
2117
<Grid>
22-
<ui:NavigationView
23-
x:Name="NavigationViewControl"
24-
AlwaysShowHeader="True"
25-
Canvas.ZIndex="0"
26-
CompactModeThresholdWidth="600"
27-
DisplayModeChanged="NavigationViewControl_DisplayModeChanged"
28-
ExpandedModeThresholdWidth="800"
29-
Header="General"
30-
IsPaneOpen="True"
31-
IsTabStop="False"
32-
Loaded="OnNavigationViewControlLoaded"
33-
PaneClosing="NavigationViewControl_PaneClosing"
34-
PaneOpening="NavigationViewControl_PaneOpening"
35-
SelectionChanged="OnNavigationViewSelectionChanged">
36-
37-
<ui:NavigationView.PaneCustomContent>
38-
<ikw:SimpleStackPanel
39-
Margin="4,10,0,10"
40-
Orientation="Horizontal"
41-
Spacing="12">
42-
<Image
43-
Width="60"
44-
Height="60"
45-
RenderOptions.BitmapScalingMode="HighQuality"
46-
Source="/Assets/WpfLibrary_Minimal_64w.png" />
47-
<TextBlock
48-
Grid.Column="1"
49-
VerticalAlignment="Center"
50-
FontSize="14"
51-
FontWeight="SemiBold"
52-
Style="{DynamicResource CaptionTextBlockStyle}"
53-
Text="{x:Static local:NavigationRootPage.GetAppTitleFromSystem}"
54-
TextWrapping="NoWrap" />
55-
</ikw:SimpleStackPanel>
56-
</ui:NavigationView.PaneCustomContent>
57-
58-
<ui:NavigationView.MenuItems>
59-
<ui:NavigationViewItem Content="General">
60-
<ui:NavigationViewItem.Icon>
61-
<ui:FontIcon Glyph="&#xE713;" />
62-
</ui:NavigationViewItem.Icon>
63-
</ui:NavigationViewItem>
64-
<ui:NavigationViewItem Content="About">
65-
<ui:NavigationViewItem.Icon>
66-
<ui:FontIcon Glyph="&#xE946;" />
67-
</ui:NavigationViewItem.Icon>
68-
</ui:NavigationViewItem>
69-
</ui:NavigationView.MenuItems>
70-
71-
<ui:NavigationView.HeaderTemplate>
72-
<DataTemplate>
73-
<TextBlock
74-
FontSize="28"
75-
FontWeight="SemiBold"
76-
Text="{Binding Header, ElementName=NavigationViewControl, Mode=OneWay}" />
77-
</DataTemplate>
78-
</ui:NavigationView.HeaderTemplate>
79-
80-
<ui:Frame
81-
x:Name="rootFrame"
82-
Margin="0,24,0,0"
83-
Navigated="OnRootFrameNavigated"
84-
Navigating="OnRootFrameNavigating" />
85-
</ui:NavigationView>
18+
<StackPanel>
19+
<ikw:SimpleStackPanel Margin="20" Spacing="10">
20+
<StackPanel Orientation="Horizontal">
21+
<TextBlock Text="Current backdrop: " />
22+
<TextBlock x:Name="tbCurrentBackdrop" />
23+
</StackPanel>
24+
<Button
25+
x:Name="btnChangeBackdrop"
26+
AutomationProperties.Name="ChangeBackdropButton"
27+
Click="ChangeBackdropButton_Click"
28+
Content="Change Backdrop" />
29+
<TextBlock x:Name="tbChangeStatus" />
30+
</ikw:SimpleStackPanel>
31+
</StackPanel>
8632
</Grid>
87-
</Window>
33+
</Window>

‎source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleSystemBackdropsWindow.xaml.cs‎

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,62 @@
1-
using iNKORE.UI.WPF.Modern.Controls;
1+
using iNKORE.UI.WPF.Helpers;
2+
using iNKORE.UI.WPF.Modern.Controls.Helpers;
3+
using iNKORE.UI.WPF.Modern.Controls.Primitives;
4+
using iNKORE.UI.WPF.Modern.Helpers;
5+
using iNKORE.UI.WPF.Modern.Helpers.Styles;
6+
using System;
7+
using System.Collections.Generic;
8+
using System.Drawing.Drawing2D;
9+
using System.Linq;
10+
using System.Text;
11+
using System.Threading.Tasks;
212
using System.Windows;
3-
using System.Windows.Navigation;
4-
5-
namespace iNKORE.UI.WPF.Modern.Gallery.SamplePages;
6-
7-
public partial class SampleSystemBackdropsWindow : Window
13+
using System.Windows.Controls;
14+
using System.Windows.Data;
15+
using System.Windows.Documents;
16+
using System.Windows.Input;
17+
using System.Windows.Media;
18+
using System.Windows.Media.Imaging;
19+
using System.Windows.Shapes;
20+
21+
namespace iNKORE.UI.WPF.Modern.Gallery.SamplePages
822
{
9-
public SampleSystemBackdropsWindow()
10-
{
11-
InitializeComponent();
12-
}
13-
14-
private void OnNavigationViewControlLoaded(object sender, RoutedEventArgs e)
15-
{
16-
17-
}
18-
19-
object _lastItem = null;
20-
21-
private void OnNavigationViewSelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
22-
{
23-
}
24-
25-
private void OnRootFrameNavigated(object sender, NavigationEventArgs e)
26-
{
27-
}
28-
29-
private void OnControlsSearchBoxTextChanged(iNKORE.UI.WPF.Modern.Controls.AutoSuggestBox sender, iNKORE.UI.WPF.Modern.Controls.AutoSuggestBoxTextChangedEventArgs args)
30-
{
31-
}
32-
33-
private void OnControlsSearchBoxQuerySubmitted(iNKORE.UI.WPF.Modern.Controls.AutoSuggestBox sender, iNKORE.UI.WPF.Modern.Controls.AutoSuggestBoxQuerySubmittedEventArgs args)
34-
{
35-
}
36-
37-
private void NavigationViewControl_PaneClosing(NavigationView sender, NavigationViewPaneClosingEventArgs args)
38-
{
39-
}
40-
41-
private void NavigationViewControl_PaneOpening(NavigationView sender, object args)
42-
{
43-
}
44-
45-
private void NavigationViewControl_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
46-
{
47-
48-
}
49-
50-
private void Page_Loaded(object sender, RoutedEventArgs e)
51-
{
52-
53-
}
54-
55-
private void rootFrame_Navigating(object sender, NavigatingCancelEventArgs e)
56-
{
57-
58-
}
59-
60-
private void OnRootFrameNavigating(object sender, NavigatingCancelEventArgs e)
61-
{
23+
/// <summary>
24+
/// SampleSystemBackdropsWindow.xaml 的交互逻辑
25+
/// </summary>
26+
public partial class SampleSystemBackdropsWindow : Window
27+
{
28+
BackdropType m_currentBackdrop => WindowHelper.GetSystemBackdropType(this);
29+
bool m_useAcrylicBackdrop => WindowHelper.GetSystemBackdropType(this) == BackdropType.Acrylic;
30+
bool m_useAeroBackdrop => WindowHelper.GetUseAeroBackdrop(this);
31+
32+
public SampleSystemBackdropsWindow()
33+
{
34+
InitializeComponent();
35+
}
36+
37+
void ChangeBackdropButton_Click(object sender, RoutedEventArgs e)
38+
{
39+
if (OSVersionHelper.IsWindows11OrGreater)
40+
{
41+
BackdropType newType;
42+
switch (m_currentBackdrop)
43+
{
44+
case BackdropType.Mica: newType = BackdropType.Tabbed; break;
45+
case BackdropType.Tabbed: newType = BackdropType.Acrylic; break;
46+
case BackdropType.Acrylic: newType = BackdropType.None; break;
47+
default:
48+
case BackdropType.None: newType = BackdropType.Mica; break;
49+
}
50+
WindowHelper.SetSystemBackdropType(this, newType);
51+
}
52+
else if (OSVersionHelper.IsWindows10OrGreater)
53+
{
54+
WindowHelper.SetSystemBackdropType(this, m_useAcrylicBackdrop ? BackdropType.Acrylic : BackdropType.None);
55+
}
56+
else if (OSVersionHelper.IsWindowsVistaOrGreater)
57+
{
58+
WindowHelper.SetUseAeroBackdrop(this, !m_useAeroBackdrop);
59+
}
60+
}
6261
}
6362
}

0 commit comments

Comments
 (0)