improve:aovidfullsreen

This commit is contained in:
2025-10-02 18:54:09 +08:00
parent 2b4f88becd
commit f6aebb15b4
2 changed files with 29 additions and 12 deletions
@@ -1582,6 +1582,13 @@ namespace Ink_Canvas
pos.X = (screenWidth - floatingBarWidth) / 2; pos.X = (screenWidth - floatingBarWidth) / 2;
if (!PosXCaculatedWithTaskbarHeight) if (!PosXCaculatedWithTaskbarHeight)
{
if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
{
var workingAreaHeight = Screen.FromHandle(windowHandle).WorkingArea.Height / dpiScaleY;
pos.Y = workingAreaHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
}
else
{ {
// 如果任务栏高度为0(隐藏状态),则使用固定边距 // 如果任务栏高度为0(隐藏状态),则使用固定边距
if (toolbarHeight == 0) if (toolbarHeight == 0)
@@ -1594,7 +1601,16 @@ namespace Ink_Canvas
pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY; pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
} }
} }
}
else if (PosXCaculatedWithTaskbarHeight) else if (PosXCaculatedWithTaskbarHeight)
{
if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
{
var workingAreaHeight = Screen.FromHandle(windowHandle).WorkingArea.Height / dpiScaleY;
pos.Y = workingAreaHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
ViewboxFloatingBarScaleTransform.ScaleY * 3;
}
else
{ {
// 如果任务栏高度为0(隐藏状态),则使用固定高度 // 如果任务栏高度为0(隐藏状态),则使用固定高度
if (toolbarHeight == 0) if (toolbarHeight == 0)
@@ -1609,6 +1625,7 @@ namespace Ink_Canvas
toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3; toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
} }
} }
}
if (MarginFromEdge != -60) if (MarginFromEdge != -60)
{ {