improve:aovidfullsreen

This commit is contained in:
2025-10-02 19:04:28 +08:00
parent c135bf8fb8
commit bd9095b4c2
2 changed files with 4 additions and 5 deletions
@@ -1513,11 +1513,6 @@ namespace Ink_Canvas
return; return;
} }
if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
{
return;
}
if (MarginFromEdge == 60) MarginFromEdge = 55; if (MarginFromEdge == 60) MarginFromEdge = 55;
await Dispatcher.InvokeAsync(() => await Dispatcher.InvokeAsync(() =>
{ {
@@ -1588,9 +1583,11 @@ namespace Ink_Canvas
if (!PosXCaculatedWithTaskbarHeight) if (!PosXCaculatedWithTaskbarHeight)
{ {
// 如果任务栏高度为0(隐藏状态),则使用固定边距
if (toolbarHeight == 0) if (toolbarHeight == 0)
{ {
pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY; pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
LogHelper.WriteLogToFile($"任务栏隐藏,使用固定边距: {MarginFromEdge}");
} }
else else
{ {
@@ -1599,10 +1596,12 @@ namespace Ink_Canvas
} }
else if (PosXCaculatedWithTaskbarHeight) else if (PosXCaculatedWithTaskbarHeight)
{ {
// 如果任务栏高度为0(隐藏状态),则使用固定高度
if (toolbarHeight == 0) if (toolbarHeight == 0)
{ {
pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY - pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
3 * ViewboxFloatingBarScaleTransform.ScaleY; 3 * ViewboxFloatingBarScaleTransform.ScaleY;
LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}");
} }
else else
{ {