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

Update MW_FloatingBarIcons.cs

Browse Source
This commit is contained in:
PrefacedCorg
2026-04-27 18:13:44 +08:00
parent 9e5ad7e2b4
commit e31dbbcedc
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+28 -6
View File
@@ -1736,9 +1736,20 @@ namespace Ink_Canvas
var windowHandle = new WindowInteropHelper(this).Handle; var windowHandle = new WindowInteropHelper(this).Handle;
var screen = Screen.FromHandle(windowHandle); var screen = Screen.FromHandle(windowHandle);
double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY; double screenWidth, screenHeight;
// 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响 double toolbarHeight;
var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY); if (Settings.Advanced.IsEnableAvoidFullScreenHelper && PosXCaculatedWithTaskbarHeight)
{
screenWidth = screen.WorkingArea.Width / dpiScaleX;
screenHeight = screen.WorkingArea.Height / dpiScaleY;
toolbarHeight = 0;
}
else
{
screenWidth = screen.Bounds.Width / dpiScaleX;
screenHeight = screen.Bounds.Height / dpiScaleY;
toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
}
// 使用更可靠的方法获取浮动栏宽度 // 使用更可靠的方法获取浮动栏宽度
double baseWidth = ViewboxFloatingBar.ActualWidth; double baseWidth = ViewboxFloatingBar.ActualWidth;
@@ -1881,9 +1892,20 @@ namespace Ink_Canvas
var windowHandle = new WindowInteropHelper(this).Handle; var windowHandle = new WindowInteropHelper(this).Handle;
var screen = Screen.FromHandle(windowHandle); var screen = Screen.FromHandle(windowHandle);
double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY; double screenWidth, screenHeight;
// 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响 double toolbarHeight;
var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY); if (Settings.Advanced.IsEnableAvoidFullScreenHelper)
{
screenWidth = screen.WorkingArea.Width / dpiScaleX;
screenHeight = screen.WorkingArea.Height / dpiScaleY;
toolbarHeight = 0;
}
else
{
screenWidth = screen.Bounds.Width / dpiScaleX;
screenHeight = screen.Bounds.Height / dpiScaleY;
toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
}
double baseWidth = ViewboxFloatingBar.ActualWidth; double baseWidth = ViewboxFloatingBar.ActualWidth;