Skip to content

Commit c73123c

Browse files
PrefacedCorgPrefacedCorg
committed
fix:触摸滑动(左右两边)
1 parent 73935e0 commit c73123c

1 file changed

Lines changed: 79 additions & 77 deletions

File tree

‎Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml‎

Lines changed: 79 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212

1313
Title="启动">
1414

15-
<ScrollViewer Padding="59,0,59,0" PanningMode="VerticalFirst">
16-
<FrameworkElement.Resources>
15+
<ScrollViewer PanningMode="VerticalFirst">
16+
<Grid Margin="59,0,59,0">
17+
<FrameworkElement.Resources>
1718
<!-- Spacing between cards -->
1819
<sys:Double x:Key="SettingsCardSpacing">4</sys:Double>
1920
<!-- Style (inc. the correct spacing) of a section header -->
@@ -25,93 +26,94 @@
2526
</Style.Setters>
2627
</Style>
2728
</FrameworkElement.Resources>
28-
<Grid>
29-
<ikw:SimpleStackPanel MaxWidth="1000"
30-
HorizontalAlignment="Stretch"
31-
Spacing="{StaticResource SettingsCardSpacing}">
29+
<Grid>
30+
<ikw:SimpleStackPanel MaxWidth="1000"
31+
HorizontalAlignment="Stretch"
32+
Spacing="{StaticResource SettingsCardSpacing}">
3233

33-
<!-- 窗口设置 -->
34-
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
35-
Text="窗口设置" />
34+
<!-- 窗口设置 -->
35+
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
36+
Text="窗口设置" />
3637

37-
<!-- 窗口无焦点模式 -->
38-
<ui:SettingsCard Description="{i18n:I18n Key=Startup_NoFocusModeHint}"
39-
Header="{i18n:I18n Key=Startup_NoFocusMode}">
40-
<ui:SettingsCard.HeaderIcon>
41-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.View}" />
42-
</ui:SettingsCard.HeaderIcon>
43-
<ui:ToggleSwitch Name="ToggleSwitchNoFocusMode" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchNoFocusMode_Toggled" />
44-
</ui:SettingsCard>
38+
<!-- 窗口无焦点模式 -->
39+
<ui:SettingsCard Description="{i18n:I18n Key=Startup_NoFocusModeHint}"
40+
Header="{i18n:I18n Key=Startup_NoFocusMode}">
41+
<ui:SettingsCard.HeaderIcon>
42+
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.View}" />
43+
</ui:SettingsCard.HeaderIcon>
44+
<ui:ToggleSwitch Name="ToggleSwitchNoFocusMode" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchNoFocusMode_Toggled" />
45+
</ui:SettingsCard>
4546

46-
<!-- 窗口无边框模式 -->
47-
<ui:SettingsCard Description="{i18n:I18n Key=Startup_NoBorderModeHint}"
48-
Header="{i18n:I18n Key=Startup_NoBorderMode}">
49-
<ui:SettingsCard.HeaderIcon>
50-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.FullScreen}" />
51-
</ui:SettingsCard.HeaderIcon>
52-
<ui:ToggleSwitch Name="ToggleSwitchWindowMode" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchWindowMode_Toggled" />
53-
</ui:SettingsCard>
47+
<!-- 窗口无边框模式 -->
48+
<ui:SettingsCard Description="{i18n:I18n Key=Startup_NoBorderModeHint}"
49+
Header="{i18n:I18n Key=Startup_NoBorderMode}">
50+
<ui:SettingsCard.HeaderIcon>
51+
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.FullScreen}" />
52+
</ui:SettingsCard.HeaderIcon>
53+
<ui:ToggleSwitch Name="ToggleSwitchWindowMode" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchWindowMode_Toggled" />
54+
</ui:SettingsCard>
5455

55-
<!-- 窗口置顶 -->
56-
<ui:SettingsCard Description="{i18n:I18n Key=Startup_TopMostHint}"
57-
Header="{i18n:I18n Key=Startup_TopMost}">
58-
<ui:SettingsCard.HeaderIcon>
59-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Pinned}" />
60-
</ui:SettingsCard.HeaderIcon>
61-
<ui:ToggleSwitch Name="ToggleSwitchAlwaysOnTop" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchAlwaysOnTop_Toggled" />
62-
</ui:SettingsCard>
56+
<!-- 窗口置顶 -->
57+
<ui:SettingsCard Description="{i18n:I18n Key=Startup_TopMostHint}"
58+
Header="{i18n:I18n Key=Startup_TopMost}">
59+
<ui:SettingsCard.HeaderIcon>
60+
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Pinned}" />
61+
</ui:SettingsCard.HeaderIcon>
62+
<ui:ToggleSwitch Name="ToggleSwitchAlwaysOnTop" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchAlwaysOnTop_Toggled" />
63+
</ui:SettingsCard>
6364

64-
<!-- UIA置顶 -->
65-
<ui:SettingsCard Description="{i18n:I18n Key=Startup_UIAccessTopMostHint_1}"
66-
Header="{i18n:I18n Key=Startup_UIATopMost}">
67-
<ui:SettingsCard.HeaderIcon>
68-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Shield}" />
69-
</ui:SettingsCard.HeaderIcon>
70-
<ui:ToggleSwitch Name="ToggleSwitchUIAccessTopMost" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchUIAccessTopMost_Toggled" />
71-
</ui:SettingsCard>
65+
<!-- UIA置顶 -->
66+
<ui:SettingsCard Description="{i18n:I18n Key=Startup_UIAccessTopMostHint_1}"
67+
Header="{i18n:I18n Key=Startup_UIATopMost}">
68+
<ui:SettingsCard.HeaderIcon>
69+
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Shield}" />
70+
</ui:SettingsCard.HeaderIcon>
71+
<ui:ToggleSwitch Name="ToggleSwitchUIAccessTopMost" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchUIAccessTopMost_Toggled" />
72+
</ui:SettingsCard>
7273

73-
<!-- 启动设置 -->
74-
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
75-
Text="启动设置" />
74+
<!-- 启动设置 -->
75+
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
76+
Text="启动设置" />
7677

77-
<!-- 开机时运行 -->
78-
<ui:SettingsCard Description="{i18n:I18n Key=Startup_RunAtStartupHint}"
79-
Header="{i18n:I18n Key=Startup_RunAtStartup}">
80-
<ui:SettingsCard.HeaderIcon>
81-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}"/>
82-
</ui:SettingsCard.HeaderIcon>
83-
<ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchRunAtStartup_Toggled" />
84-
</ui:SettingsCard>
78+
<!-- 开机时运行 -->
79+
<ui:SettingsCard Description="{i18n:I18n Key=Startup_RunAtStartupHint}"
80+
Header="{i18n:I18n Key=Startup_RunAtStartup}">
81+
<ui:SettingsCard.HeaderIcon>
82+
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}"/>
83+
</ui:SettingsCard.HeaderIcon>
84+
<ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchRunAtStartup_Toggled" />
85+
</ui:SettingsCard>
8586

86-
<!-- 开机运行后收纳到侧边栏 -->
87-
<ui:SettingsCard Description="{i18n:I18n Key=Startup_FoldAtStartupHint}"
88-
Header="{i18n:I18n Key=Startup_FoldAtStartup}">
89-
<ui:SettingsCard.HeaderIcon>
90-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ChevronLeft}" />
91-
</ui:SettingsCard.HeaderIcon>
92-
<ui:ToggleSwitch Name="ToggleSwitchFoldAtStartup" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchFoldAtStartup_Toggled" />
93-
</ui:SettingsCard>
87+
<!-- 开机运行后收纳到侧边栏 -->
88+
<ui:SettingsCard Description="{i18n:I18n Key=Startup_FoldAtStartupHint}"
89+
Header="{i18n:I18n Key=Startup_FoldAtStartup}">
90+
<ui:SettingsCard.HeaderIcon>
91+
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ChevronLeft}" />
92+
</ui:SettingsCard.HeaderIcon>
93+
<ui:ToggleSwitch Name="ToggleSwitchFoldAtStartup" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchFoldAtStartup_Toggled" />
94+
</ui:SettingsCard>
9495

95-
<!-- 模式设置 -->
96-
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
97-
Text="模式设置" />
96+
<!-- 模式设置 -->
97+
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
98+
Text="模式设置" />
9899

99-
<ui:SettingsExpander Description="{i18n:I18n Key=Settings_ModeDesc}"
100-
Header="{i18n:I18n Key=Settings_ModeDesc_1}">
101-
<ui:SettingsExpander.HeaderIcon>
102-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}" />
103-
</ui:SettingsExpander.HeaderIcon>
104-
<ui:SettingsExpander.Items>
105-
<ui:SettingsCard Header="仅PPT模式">
106-
<ui:ToggleSwitch Name="ToggleSwitchPPTOnlyMode" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchPPTOnlyMode_Toggled" />
107-
</ui:SettingsCard>
108-
</ui:SettingsExpander.Items>
109-
</ui:SettingsExpander>
100+
<ui:SettingsExpander Description="{i18n:I18n Key=Settings_ModeDesc}"
101+
Header="{i18n:I18n Key=Settings_ModeDesc_1}">
102+
<ui:SettingsExpander.HeaderIcon>
103+
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}" />
104+
</ui:SettingsExpander.HeaderIcon>
105+
<ui:SettingsExpander.Items>
106+
<ui:SettingsCard Header="仅PPT模式">
107+
<ui:ToggleSwitch Name="ToggleSwitchPPTOnlyMode" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchPPTOnlyMode_Toggled" />
108+
</ui:SettingsCard>
109+
</ui:SettingsExpander.Items>
110+
</ui:SettingsExpander>
110111

111-
<!-- 底部空白 -->
112-
<Rectangle Height="48" />
112+
<!-- 底部空白 -->
113+
<Rectangle Height="48" />
113114

114-
</ikw:SimpleStackPanel>
115+
</ikw:SimpleStackPanel>
116+
</Grid>
115117
</Grid>
116118
</ScrollViewer>
117119
</ui:Page>

0 commit comments

Comments
 (0)