From 28d01d023bd76310520a895bdb7f66a2e70a2043 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 21 Jan 2023 19:34:26 +0300 Subject: [PATCH] Replaced multiple static constants for square root of 2 with Qt define. --- ui/effects/cross_animation.cpp | 5 ++--- ui/widgets/checkbox.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ui/effects/cross_animation.cpp b/ui/effects/cross_animation.cpp index 865bc8a..18a9cd4 100644 --- a/ui/effects/cross_animation.cpp +++ b/ui/effects/cross_animation.cpp @@ -122,7 +122,6 @@ void CrossAnimation::paint( const auto stroke = style::ConvertScaleExact(st.stroke); - const auto sqrt2 = sqrt(2.); const auto deleteScale = shown + st.minScale * (1. - shown); const auto deleteSkip = (deleteScale * st.skip) + (1. - deleteScale) * (st.size / 2); @@ -131,7 +130,7 @@ void CrossAnimation::paint( const auto deleteTop = y + deleteSkip + 0.; const auto deleteWidth = st.size - 2 * deleteSkip; const auto deleteHeight = st.size - 2 * deleteSkip; - const auto deleteStroke = stroke / sqrt2; + const auto deleteStroke = stroke / M_SQRT2; std::array pathDelete = { { { deleteLeft, deleteTop + deleteStroke }, { deleteLeft + deleteStroke, deleteTop }, @@ -180,7 +179,7 @@ void CrossAnimation::paint( p.fillPath(path, color); } if (loadingArcLength != 0) { - auto roundSkip = (st.size * (1 - sqrt2) + 2 * sqrt2 * deleteSkip + stroke) / 2; + auto roundSkip = (st.size * (1 - M_SQRT2) + 2 * M_SQRT2 * deleteSkip + stroke) / 2; auto roundPart = QRectF(x + roundSkip, y + roundSkip, st.size - 2 * roundSkip, st.size - 2 * roundSkip); if (staticLoading) { anim::DrawStaticLoading(p, roundPart, stroke, color); diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp index dc5d50f..7cc28a8 100644 --- a/ui/widgets/checkbox.cpp +++ b/ui/widgets/checkbox.cpp @@ -137,8 +137,7 @@ void ToggleView::paintXV(QPainter &p, int left, int top, int outerWidth, float64 Expects(_st->vsize > 0); Expects(_st->stroke > 0); - static const auto sqrt2 = sqrt(2.); - const auto stroke = (0. + _st->stroke) / sqrt2; + const auto stroke = (0. + _st->stroke) / M_SQRT2; if (toggled < 1) { // Just X or X->V. const auto xSize = 0. + _st->xsize;