diff options
Diffstat (limited to 'xfa/src/fwl/src/theme/checkboxtp.cpp')
| -rw-r--r-- | xfa/src/fwl/src/theme/checkboxtp.cpp | 61 |
1 files changed, 23 insertions, 38 deletions
diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp index 3cc6f43622..69a996bbe0 100644 --- a/xfa/src/fwl/src/theme/checkboxtp.cpp +++ b/xfa/src/fwl/src/theme/checkboxtp.cpp @@ -334,9 +334,8 @@ void CFWL_CheckBoxTP::DrawSignStar(CFX_Graphics* pGraphics, FX_FLOAT fBottom = pRtSign->bottom(); FX_FLOAT fRadius = (pRtSign->top - fBottom) / (1 + (FX_FLOAT)cos(FX_PI / 5.0f)); - CFX_PointF ptCenter; - ptCenter.Set((pRtSign->left + pRtSign->right()) / 2.0f, - (pRtSign->top + fBottom) / 2.0f); + CFX_PointF ptCenter((pRtSign->left + pRtSign->right()) / 2.0f, + (pRtSign->top + fBottom) / 2.0f); FX_FLOAT px[5], py[5]; FX_FLOAT fAngel = FX_PI / 10.0f; for (int32_t i = 0; i < 5; i++) { @@ -466,42 +465,28 @@ void CFWL_CheckBoxTP::initCheckPath(FX_FLOAT fCheckLen) { FX_FLOAT fWidth = CHECKBOX_SIZE_SIGNPATH; FX_FLOAT fHeight = -CHECKBOX_SIZE_SIGNPATH; FX_FLOAT fBottom = CHECKBOX_SIZE_SIGNPATH; - FX_FLOAT px1, py1, px2, py2; - CFX_PointF pt1; - pt1.Set(fWidth / 15.0f, fBottom + fHeight * 2 / 5.0f); - CFX_PointF pt2; - pt2.Set(fWidth / 4.5f, fBottom + fHeight / 16.0f); - CFX_PointF pt3; - pt3.Set(fWidth / 3.0f, fBottom); - CFX_PointF pt4; - pt4.Set(fWidth * 14 / 15.0f, fBottom + fHeight * 15 / 16.0f); - CFX_PointF pt5; - pt5.Set(fWidth / 3.6f, fBottom + fHeight / 3.5f); - CFX_PointF pt12; - pt12.Set(fWidth / 7.0f, fBottom + fHeight * 2 / 7.0f); - CFX_PointF pt21; - pt21.Set(fWidth / 5.0f, fBottom + fHeight / 5.0f); - CFX_PointF pt23; - pt23.Set(fWidth / 4.4f, fBottom + fHeight * 0 / 16.0f); - CFX_PointF pt32; - pt32.Set(fWidth / 4.0f, fBottom); - CFX_PointF pt34; - pt34.Set(fWidth * (1 / 7.0f + 7 / 15.0f), fBottom + fHeight * 4 / 5.0f); - CFX_PointF pt43; - pt43.Set(fWidth * (1 / 7.0f + 7 / 15.0f), fBottom + fHeight * 4 / 5.0f); - CFX_PointF pt45; - pt45.Set(fWidth * 7 / 15.0f, fBottom + fHeight * 8 / 7.0f); - CFX_PointF pt54; - pt54.Set(fWidth / 3.4f, fBottom + fHeight / 3.5f); - CFX_PointF pt51; - pt51.Set(fWidth / 3.6f, fBottom + fHeight / 4.0f); - CFX_PointF pt15; - pt15.Set(fWidth / 3.5f, fBottom + fHeight * 3.5f / 5.0f); + CFX_PointF pt1(fWidth / 15.0f, fBottom + fHeight * 2 / 5.0f); + CFX_PointF pt2(fWidth / 4.5f, fBottom + fHeight / 16.0f); + CFX_PointF pt3(fWidth / 3.0f, fBottom); + CFX_PointF pt4(fWidth * 14 / 15.0f, fBottom + fHeight * 15 / 16.0f); + CFX_PointF pt5(fWidth / 3.6f, fBottom + fHeight / 3.5f); + CFX_PointF pt12(fWidth / 7.0f, fBottom + fHeight * 2 / 7.0f); + CFX_PointF pt21(fWidth / 5.0f, fBottom + fHeight / 5.0f); + CFX_PointF pt23(fWidth / 4.4f, fBottom + fHeight * 0 / 16.0f); + CFX_PointF pt32(fWidth / 4.0f, fBottom); + CFX_PointF pt34(fWidth * (1 / 7.0f + 7 / 15.0f), + fBottom + fHeight * 4 / 5.0f); + CFX_PointF pt43(fWidth * (1 / 7.0f + 7 / 15.0f), + fBottom + fHeight * 4 / 5.0f); + CFX_PointF pt45(fWidth * 7 / 15.0f, fBottom + fHeight * 8 / 7.0f); + CFX_PointF pt54(fWidth / 3.4f, fBottom + fHeight / 3.5f); + CFX_PointF pt51(fWidth / 3.6f, fBottom + fHeight / 4.0f); + CFX_PointF pt15(fWidth / 3.5f, fBottom + fHeight * 3.5f / 5.0f); m_pCheckPath->MoveTo(pt1.x, pt1.y); - px1 = pt12.x - pt1.x; - py1 = pt12.y - pt1.y; - px2 = pt21.x - pt2.x; - py2 = pt21.y - pt2.y; + FX_FLOAT px1 = pt12.x - pt1.x; + FX_FLOAT py1 = pt12.y - pt1.y; + FX_FLOAT px2 = pt21.x - pt2.x; + FX_FLOAT py2 = pt21.y - pt2.y; m_pCheckPath->BezierTo(pt1.x + px1 * FWLTHEME_BEZIER, pt1.y + py1 * FWLTHEME_BEZIER, pt2.x + px2 * FWLTHEME_BEZIER, |