diff --git a/Ink Canvas/Windows/Controls/WinUI3CloseButton.cs b/Ink Canvas/Windows/Controls/WinUI3CloseButton.cs new file mode 100644 index 00000000..2b4dc8b8 --- /dev/null +++ b/Ink Canvas/Windows/Controls/WinUI3CloseButton.cs @@ -0,0 +1,28 @@ +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; + +namespace Ink_Canvas.Windows.Controls +{ + public class WinUI3CloseButton : ButtonBase + { + static WinUI3CloseButton() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(WinUI3CloseButton), new FrameworkPropertyMetadata(typeof(WinUI3CloseButton))); + } + + public bool IsActive + { + get => (bool)GetValue(IsActiveProperty); + set => SetValue(IsActiveProperty, value); + } + + public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register( + nameof(IsActive), + typeof(bool), + typeof(WinUI3CloseButton), + new PropertyMetadata(true) + ); + } +} diff --git a/Ink Canvas/Windows/Controls/WinUI3CloseButton.xaml b/Ink Canvas/Windows/Controls/WinUI3CloseButton.xaml new file mode 100644 index 00000000..08da94f1 --- /dev/null +++ b/Ink Canvas/Windows/Controls/WinUI3CloseButton.xaml @@ -0,0 +1,63 @@ + + + + + + + + + + diff --git a/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml b/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml index b93f680b..67e06f13 100644 --- a/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml +++ b/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml @@ -5,49 +5,26 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Ink_Canvas" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" + xmlns:controls="clr-namespace:Ink_Canvas.Windows.Controls" Topmost="True" Background="Transparent" mc:Ignorable="d" WindowStyle="None" AllowsTransparency="True" Loaded="Window_Loaded" Closing="Window_Closing" WindowStartupLocation="CenterScreen" Title="Ink Canvas 画板 - 计时器" Height="450" Width="900"> + + + + + + + + - +