ZengQingming/JoyD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复温差图模式下矩形绘制方向问题：确保无论从左上到右下还是右下到左上绘制矩形都符合预期行为

Browse Source
This commit is contained in:
zqm
2025-11-10 17:23:00 +08:00
parent a96e2e3a6b
commit 61f341003b
1 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs
View File

@@ -1291,27 +1291,21 @@ namespace JoyD.Windows.CS
float scaledHalfBrushSizeX = _currentBrushSize / 2 * scaleX; float scaledHalfBrushSizeX = _currentBrushSize / 2 * scaleX;
float scaledHalfBrushSizeY = _currentBrushSize / 2 * scaleY; float scaledHalfBrushSizeY = _currentBrushSize / 2 * scaleY;
int x = _rectangleStartPoint.X; // 计算起始点和结束点
int y = _rectangleStartPoint.Y; Point startPoint = new Point(
// 右下角为当前鼠标位置+画笔一半的宽高（基于光标大小转换） (int)(_rectangleStartPoint.X),
(int)(_rectangleStartPoint.Y)
);
Point endPoint = new Point( Point endPoint = new Point(
(int)(currentImagePoint.X + scaledHalfBrushSizeX), (int)(currentImagePoint.X + scaledHalfBrushSizeX),
(int)(currentImagePoint.Y + scaledHalfBrushSizeY) (int)(currentImagePoint.Y + scaledHalfBrushSizeY)
); );
int width = endPoint.X - x;
int height = endPoint.Y - y;
// 确保矩形大小为正数，调整起点和大小 // 无论绘制方向如何，都确保左上角为起始点
if (width < 0) int x = Math.Min(startPoint.X, endPoint.X);
{ int y = Math.Min(startPoint.Y, endPoint.Y);
x += width; int width = Math.Abs(endPoint.X - startPoint.X);
width = -width; int height = Math.Abs(endPoint.Y - startPoint.Y);
}
if (height < 0)
{
y += height;
height = -height;
}
Rectangle rect = new Rectangle(x, y, width, height); Rectangle rect = new Rectangle(x, y, width, height);
@@ -1783,27 +1777,21 @@ namespace JoyD.Windows.CS
float scaledHalfBrushSizeX = _currentBrushSize / 2 * scaleX; float scaledHalfBrushSizeX = _currentBrushSize / 2 * scaleX;
float scaledHalfBrushSizeY = _currentBrushSize / 2 * scaleY; float scaledHalfBrushSizeY = _currentBrushSize / 2 * scaleY;
int x = _rectangleStartPoint.X; // 计算起始点和结束点
int y = _rectangleStartPoint.Y; Point startPoint = new Point(
// 右下角为当前鼠标位置+画笔一半的宽高（基于光标大小转换） (int)(_rectangleStartPoint.X),
(int)(_rectangleStartPoint.Y)
);
Point endPoint = new Point( Point endPoint = new Point(
(int)(currentImagePoint.X + scaledHalfBrushSizeX), (int)(currentImagePoint.X + scaledHalfBrushSizeX),
(int)(currentImagePoint.Y + scaledHalfBrushSizeY) (int)(currentImagePoint.Y + scaledHalfBrushSizeY)
); );
int width = endPoint.X - x;
int height = endPoint.Y - y;
// 确保矩形大小为正数，调整起点和大小 // 无论绘制方向如何，都确保左上角为起始点
if (width < 0) int x = Math.Min(startPoint.X, endPoint.X);
{ int y = Math.Min(startPoint.Y, endPoint.Y);
x += width; int width = Math.Abs(endPoint.X - startPoint.X);
width = -width; int height = Math.Abs(endPoint.Y - startPoint.Y);
}
if (height < 0)
{
y += height;
height = -height;
}
Rectangle rect = new Rectangle(x, y, width, height); Rectangle rect = new Rectangle(x, y, width, height);