add:退出白板收纳
This commit is contained in:
@@ -183,7 +183,7 @@ namespace Ink_Canvas.Helpers
|
|||||||
_mainWindow.BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
|
_mainWindow.BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
|
||||||
isInSlideShow &&
|
isInSlideShow &&
|
||||||
hasValidPageCount &&
|
hasValidPageCount &&
|
||||||
!Settings.Automation.IsAutoFoldInPPTSlideShow;
|
!MainWindow.Settings.Automation.IsAutoFoldInPPTSlideShow;
|
||||||
|
|
||||||
if (!shouldShowButtons)
|
if (!shouldShowButtons)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3098,6 +3098,15 @@
|
|||||||
Toggled="ToggleSwitchAutoFoldAfterPPTSlideShow_Toggled" />
|
Toggled="ToggleSwitchAutoFoldAfterPPTSlideShow_Toggled" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<TextBlock Text="# 开启后,如果进入PPT放映前为收纳模式则退出后也为收纳模式,如果进入前不是收纳模式则退出后也不是收纳模式" TextWrapping="Wrap" Foreground="#a1a1aa" />
|
<TextBlock Text="# 开启后,如果进入PPT放映前为收纳模式则退出后也为收纳模式,如果进入前不是收纳模式则退出后也不是收纳模式" TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||||
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
|
<TextBlock Foreground="#fafafa" Text="退出白板时自动收纳"
|
||||||
|
VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
|
||||||
|
<ui:ToggleSwitch OnContent="" OffContent=""
|
||||||
|
Name="ToggleSwitchAutoFoldWhenExitWhiteboard"
|
||||||
|
IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||||
|
Toggled="ToggleSwitchAutoFoldWhenExitWhiteboard_Toggled" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<TextBlock Text="# 开启后,退出白板模式时会自动收纳到侧边栏" TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
<GroupBox Name="GroupBoxRandWindow">
|
<GroupBox Name="GroupBoxRandWindow">
|
||||||
|
|||||||
@@ -2808,6 +2808,12 @@ namespace Ink_Canvas
|
|||||||
// 新增:在屏幕模式下恢复基础浮动栏的显示
|
// 新增:在屏幕模式下恢复基础浮动栏的显示
|
||||||
ViewboxFloatingBar.Visibility = Visibility.Visible;
|
ViewboxFloatingBar.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
// 新增:退出白板时自动收纳功能
|
||||||
|
if (Settings.Automation.IsAutoFoldWhenExitWhiteboard && !isFloatingBarFolded)
|
||||||
|
{
|
||||||
|
FoldFloatingBar_MouseUp(null, null);
|
||||||
|
}
|
||||||
|
|
||||||
if (BtnSwitchTheme.Content.ToString() == "浅色")
|
if (BtnSwitchTheme.Content.ToString() == "浅色")
|
||||||
{
|
{
|
||||||
BtnSwitch.Content = "黑板";
|
BtnSwitch.Content = "黑板";
|
||||||
|
|||||||
@@ -700,6 +700,9 @@ namespace Ink_Canvas
|
|||||||
if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow &&
|
if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow &&
|
||||||
!Settings.Automation.IsAutoFoldInPPTSlideShow)
|
!Settings.Automation.IsAutoFoldInPPTSlideShow)
|
||||||
{
|
{
|
||||||
|
// 先进入批注模式,这会显示调色盘
|
||||||
|
PenIcon_Click(null, null);
|
||||||
|
// 然后设置颜色
|
||||||
BtnColorRed_Click(null, null);
|
BtnColorRed_Click(null, null);
|
||||||
Dispatcher.BeginInvoke(new Action(() =>
|
Dispatcher.BeginInvoke(new Action(() =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1543,6 +1543,13 @@ namespace Ink_Canvas
|
|||||||
SaveSettingsToFile();
|
SaveSettingsToFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ToggleSwitchAutoFoldWhenExitWhiteboard_Toggled(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (!isLoaded) return;
|
||||||
|
Settings.Automation.IsAutoFoldWhenExitWhiteboard = ToggleSwitchAutoFoldWhenExitWhiteboard.IsOn;
|
||||||
|
SaveSettingsToFile();
|
||||||
|
}
|
||||||
|
|
||||||
private void ToggleSwitchSaveScreenshotsInDateFolders_Toggled(object sender, RoutedEventArgs e)
|
private void ToggleSwitchSaveScreenshotsInDateFolders_Toggled(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (!isLoaded) return;
|
if (!isLoaded) return;
|
||||||
|
|||||||
@@ -907,6 +907,9 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
// 加载退出收纳模式自动切换至批注模式设置
|
// 加载退出收纳模式自动切换至批注模式设置
|
||||||
ToggleSwitchAutoEnterAnnotationModeWhenExitFoldMode.IsOn = Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode;
|
ToggleSwitchAutoEnterAnnotationModeWhenExitFoldMode.IsOn = Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode;
|
||||||
|
|
||||||
|
// 加载退出白板时自动收纳设置
|
||||||
|
ToggleSwitchAutoFoldWhenExitWhiteboard.IsOn = Settings.Automation.IsAutoFoldWhenExitWhiteboard;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -339,6 +339,9 @@ namespace Ink_Canvas
|
|||||||
[JsonProperty("isAutoEnterAnnotationModeWhenExitFoldMode")]
|
[JsonProperty("isAutoEnterAnnotationModeWhenExitFoldMode")]
|
||||||
public bool IsAutoEnterAnnotationModeWhenExitFoldMode { get; set; }
|
public bool IsAutoEnterAnnotationModeWhenExitFoldMode { get; set; }
|
||||||
|
|
||||||
|
[JsonProperty("isAutoFoldWhenExitWhiteboard")]
|
||||||
|
public bool IsAutoFoldWhenExitWhiteboard { get; set; }
|
||||||
|
|
||||||
[JsonProperty("isAutoFoldInEasiNote")]
|
[JsonProperty("isAutoFoldInEasiNote")]
|
||||||
public bool IsAutoFoldInEasiNote { get; set; }
|
public bool IsAutoFoldInEasiNote { get; set; }
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user