kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Replaced multiple static constants for square root of 2 with Qt define.

Browse source
This commit is contained in:
23rd 2023-01-21 19:34:26 +03:00
parent 335f8050d9
commit 28d01d023b
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ui/effects/cross_animation.cpp
View file

@ -122,7 +122,6 @@ void CrossAnimation::paint(
const auto stroke = style::ConvertScaleExact(st.stroke); const auto stroke = style::ConvertScaleExact(st.stroke);
const auto sqrt2 = sqrt(2.);
const auto deleteScale = shown + st.minScale * (1. - shown); const auto deleteScale = shown + st.minScale * (1. - shown);
const auto deleteSkip = (deleteScale * st.skip) const auto deleteSkip = (deleteScale * st.skip)
+ (1. - deleteScale) * (st.size / 2); + (1. - deleteScale) * (st.size / 2);
@ -131,7 +130,7 @@ void CrossAnimation::paint(
const auto deleteTop = y + deleteSkip + 0.; const auto deleteTop = y + deleteSkip + 0.;
const auto deleteWidth = st.size - 2 * deleteSkip; const auto deleteWidth = st.size - 2 * deleteSkip;
const auto deleteHeight = st.size - 2 * deleteSkip; const auto deleteHeight = st.size - 2 * deleteSkip;
const auto deleteStroke = stroke / sqrt2; const auto deleteStroke = stroke / M_SQRT2;
std::array<QPointF, kPointCount> pathDelete = { { std::array<QPointF, kPointCount> pathDelete = { {
{ deleteLeft, deleteTop + deleteStroke }, { deleteLeft, deleteTop + deleteStroke },
{ deleteLeft + deleteStroke, deleteTop }, { deleteLeft + deleteStroke, deleteTop },
@ -180,7 +179,7 @@ void CrossAnimation::paint(
p.fillPath(path, color); p.fillPath(path, color);
} }
if (loadingArcLength != 0) { 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); auto roundPart = QRectF(x + roundSkip, y + roundSkip, st.size - 2 * roundSkip, st.size - 2 * roundSkip);
if (staticLoading) { if (staticLoading) {
anim::DrawStaticLoading(p, roundPart, stroke, color); anim::DrawStaticLoading(p, roundPart, stroke, color);

3
ui/widgets/checkbox.cpp
View file

@ -137,8 +137,7 @@ void ToggleView::paintXV(QPainter &p, int left, int top, int outerWidth, float64
Expects(_st->vsize > 0); Expects(_st->vsize > 0);
Expects(_st->stroke > 0); Expects(_st->stroke > 0);
static const auto sqrt2 = sqrt(2.); const auto stroke = (0. + _st->stroke) / M_SQRT2;
const auto stroke = (0. + _st->stroke) / sqrt2;
if (toggled < 1) { if (toggled < 1) {
// Just X or X->V. // Just X or X->V.
const auto xSize = 0. + _st->xsize; const auto xSize = 0. + _st->xsize;