diff --git a/Ink Canvas/Windows/OperatingGuideWindow.xaml b/Ink Canvas/Windows/OperatingGuideWindow.xaml index c911ada8..e2628752 100644 --- a/Ink Canvas/Windows/OperatingGuideWindow.xaml +++ b/Ink Canvas/Windows/OperatingGuideWindow.xaml @@ -3,99 +3,216 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 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:ikw="http://schemas.inkore.net/lib/ui/wpf" - ui:ThemeManager.RequestedTheme="Light" Topmost="True" Background="Transparent" - mc:Ignorable="d" WindowStyle="None" AllowsTransparency="True" - WindowStartupLocation="CenterScreen" + mc:Ignorable="d" Title="Ink Canvas Annotation 使用指南" - Height="600" Width="500"> - - - - - - - - + Height="600" + Width="520" + MinHeight="400" + MinWidth="400" + WindowStartupLocation="CenterScreen" + Topmost="True" + ResizeMode="CanResize" + FontFamily="Microsoft YaHei UI" + ui:ThemeManager.IsThemeAware="True" + ui:TitleBar.ExtendViewIntoTitleBar="True" + ui:WindowHelper.SystemBackdropType="Mica" + ui:WindowHelper.UseModernWindowStyle="True" + ui:TitleBar.Height="48"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + diff --git a/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs b/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs index 823151bb..f65be003 100644 --- a/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs +++ b/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs @@ -1,6 +1,5 @@ using Ink_Canvas.Helpers; using iNKORE.UI.WPF.Modern; -using iNKORE.UI.WPF.Modern.Common.IconKeys; using System; using System.Windows; using System.Windows.Input; @@ -15,33 +14,10 @@ namespace Ink_Canvas public OperatingGuideWindow() { InitializeComponent(); + RefreshTheme(); AnimationsHelper.ShowWithSlideFromBottomAndFade(this, 0.25); } - private void BtnClose_MouseUp(object sender, MouseButtonEventArgs e) - { - Close(); - } - - private void WindowDragMove(object sender, MouseEventArgs e) - { - if (e.LeftButton == MouseButtonState.Pressed) DragMove(); - } - - private void BtnFullscreen_MouseUp(object sender, MouseButtonEventArgs e) - { - if (WindowState == WindowState.Normal) - { - WindowState = WindowState.Maximized; - FontIconFullscreen.Icon = SegoeFluentIcons.BackToWindow; - } - else - { - WindowState = WindowState.Normal; - FontIconFullscreen.Icon = SegoeFluentIcons.FullScreen; - } - } - private void SCManipulationBoundaryFeedback(object sender, ManipulationBoundaryFeedbackEventArgs e) { e.Handled = true;