CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "add:高dpi适配 插件接口 设置窗口多显示器优化 fix:触摸后鼠标指针显示异常"

Browse Source 
This reverts commit ca53624149.
This commit is contained in:
PrefacedCorg
2026-04-03 00:14:28 +08:00
parent 11cb1815ad
commit 26f79da2f9
3 changed files with 142 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml
+21 -40
View File
@@ -8,7 +8,6 @@
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
Title="InkCanvasForClass 设置"
Width="1138" Height="750"
MinWidth="800" MinHeight="600"
WindowStartupLocation="CenterScreen"
ui:ThemeManager.IsThemeAware="True"
ui:TitleBar.ExtendViewIntoTitleBar="True"
@@ -16,7 +15,6 @@
ui:WindowHelper.UseModernWindowStyle="True"
ui:TitleBar.Height="48"
mc:Ignorable="d">
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -24,7 +22,6 @@
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>
<Grid>
<ui:NavigationView
x:Name="NavigationViewControl"
@@ -41,39 +38,34 @@
IsBackButtonVisible="Visible"
IsBackEnabled="True"
PaneDisplayMode="Auto"
OpenPaneLength="240"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Hidden"
ScrollViewer.HorizontalScrollBarVisibility="Disabled">
<ui:NavigationView.HeaderTemplate>
<DataTemplate>
<Grid Margin="0,8,0,12">
<Grid>
<TextBlock
Text="{Binding}"
Style="{DynamicResource TitleTextBlockStyle}"
FontSize="20"
FontWeight="SemiBold"/>
Margin="0,8,0,0" />
</Grid>
</DataTemplate>
</ui:NavigationView.HeaderTemplate>
<ui:NavigationView.AutoSuggestBox>
<ui:AutoSuggestBox
x:Name="controlsSearchBox"
MinWidth="220"
MinWidth="200"
VerticalAlignment="Center"
x:FieldModifier="public"
PlaceholderText="查找设置"
QuerySubmitted="OnControlsSearchBoxQuerySubmitted"
TextChanged="OnControlsSearchBoxTextChanged">
TextChanged="OnControlsSearchBoxTextChanged" >
<ui:AutoSuggestBox.QueryIcon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Search}" FontSize="12"/>
<ui:SymbolIcon Symbol="Find" FontSize="12" />
</ui:AutoSuggestBox.QueryIcon>
</ui:AutoSuggestBox>
</ui:NavigationView.AutoSuggestBox>
<ui:NavigationView.MenuItems>
<!-- 基本设置 -->
<ui:NavigationViewItem
x:Name="BasicItem"
Content="基本"
@@ -95,8 +87,6 @@
</ui:NavigationViewItem>
</ui:NavigationViewItem.MenuItems>
</ui:NavigationViewItem>
<!-- 页面2 -->
<ui:NavigationViewItem
x:Name="Page2Item"
Content="页面 2"
@@ -105,8 +95,6 @@
<ui:SymbolIcon Symbol="Document" />
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>
<!-- 设计设置 -->
<ui:NavigationViewItem
x:Name="DesignItem"
Content="设计"
@@ -119,25 +107,21 @@
<ui:NavigationViewItem
x:Name="IconographyItem"
Content="图标"
Tag="Iconography"
ToolTipService.ToolTip="图标设置">
Tag="Iconography">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.AllApps}"/>
</ui:NavigationViewItem.Icon>
<ui:SymbolIcon Symbol="Home" />
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>
<ui:NavigationViewItem
x:Name="TypographyItem"
Content="排版"
Tag="Typography"
ToolTipService.ToolTip="排版设置">
Tag="Typography">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Font}"/>
</ui:NavigationViewItem.Icon>
<ui:SymbolIcon Symbol="Home" />
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>
</ui:NavigationViewItem.MenuItems>
</ui:NavigationViewItem>
<!-- 外观设置 -->
<ui:NavigationViewItem
x:Name="AppearanceItem"
Content="外观"
@@ -150,28 +134,25 @@
<ui:NavigationViewItem
x:Name="ThemeItem"
Content="主题"
Tag="Theme"
ToolTipService.ToolTip="主题设置">
Tag="Theme">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:FluentSystemIcons.DarkTheme_24_Regular}"/>
</ui:NavigationViewItem.Icon>
<ui:SymbolIcon Symbol="Home" />
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>
<ui:NavigationViewItem
x:Name="ColorsItem"
Content="颜色"
Tag="Colors"
ToolTipService.ToolTip="颜色设置">
Tag="Colors">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Highlight}"/>
</ui:NavigationViewItem.Icon>
<ui:SymbolIcon Symbol="Home" />
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>
<ui:NavigationViewItem
x:Name="FontsItem"
Content="字体"
Tag="Fonts"
ToolTipService.ToolTip="字体设置">
Tag="Fonts">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Font}"/>
<ui:SymbolIcon Symbol="Home" />
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>
</ui:NavigationViewItem.MenuItems>
@@ -189,7 +170,7 @@
</ui:NavigationViewItem>
</ui:NavigationView.FooterMenuItems>
<ui:Frame x:Name="rootFrame" Navigated="OnRootFrameNavigated" NavigationUIVisibility="Hidden" />
<ui:Frame x:Name="rootFrame" Navigated="OnRootFrameNavigated" />
</ui:NavigationView>
</Grid>
</Window>