summaryrefslogtreecommitdiff
path: root/core/fxge/win32
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge/win32')
-rw-r--r--core/fxge/win32/fx_win32_device.cpp20
-rw-r--r--core/fxge/win32/win32_int.h6
2 files changed, 11 insertions, 15 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index b707a76c08..101c945fc5 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -998,14 +998,14 @@ bool CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData,
FX_RECT bbox = bbox_f.GetInnerRect();
if (bbox.Width() <= 0) {
- return DrawCosmeticLine((float)(bbox.left), (float)(bbox.top),
- (float)(bbox.left), (float)(bbox.bottom + 1),
+ return DrawCosmeticLine(CFX_PointF(bbox.left, bbox.top),
+ CFX_PointF(bbox.left, bbox.bottom + 1),
fill_color, FXDIB_BLEND_NORMAL);
}
if (bbox.Height() <= 0) {
- return DrawCosmeticLine((float)(bbox.left), (float)(bbox.top),
- (float)(bbox.right + 1), (float)(bbox.top),
- fill_color, FXDIB_BLEND_NORMAL);
+ return DrawCosmeticLine(CFX_PointF(bbox.left, bbox.top),
+ CFX_PointF(bbox.right + 1, bbox.top), fill_color,
+ FXDIB_BLEND_NORMAL);
}
}
int fill_alpha = FXARGB_A(fill_color);
@@ -1137,10 +1137,8 @@ bool CGdiDeviceDriver::SetClip_PathStroke(
return ret;
}
-bool CGdiDeviceDriver::DrawCosmeticLine(float x1,
- float y1,
- float x2,
- float y2,
+bool CGdiDeviceDriver::DrawCosmeticLine(const CFX_PointF& ptMoveTo,
+ const CFX_PointF& ptLineTo,
uint32_t color,
int blend_type) {
if (blend_type != FXDIB_BLEND_NORMAL)
@@ -1154,8 +1152,8 @@ bool CGdiDeviceDriver::DrawCosmeticLine(float x1,
HPEN hPen = CreatePen(PS_SOLID, 1, rgb);
hPen = (HPEN)SelectObject(m_hDC, hPen);
- MoveToEx(m_hDC, FXSYS_round(x1), FXSYS_round(y1), nullptr);
- LineTo(m_hDC, FXSYS_round(x2), FXSYS_round(y2));
+ MoveToEx(m_hDC, FXSYS_round(ptMoveTo.x), FXSYS_round(ptMoveTo.y), nullptr);
+ LineTo(m_hDC, FXSYS_round(ptLineTo.x), FXSYS_round(ptLineTo.y));
hPen = (HPEN)SelectObject(m_hDC, hPen);
DeleteObject(hPen);
return true;
diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index c51bae7f67..f9fcbe83af 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -150,10 +150,8 @@ class CGdiDeviceDriver : public IFX_RenderDeviceDriver {
bool FillRectWithBlend(const FX_RECT* pRect,
uint32_t fill_color,
int blend_type) override;
- bool DrawCosmeticLine(float x1,
- float y1,
- float x2,
- float y2,
+ bool DrawCosmeticLine(const CFX_PointF& ptMoveTo,
+ const CFX_PointF& ptLineTo,
uint32_t color,
int blend_type) override;
bool GetClipBox(FX_RECT* pRect) override;