void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed possible wrong range of clamp in footer of chart widget.

Browse source
This commit is contained in:
23rd 2023-10-12 16:59:29 +03:00
parent a8cb5419d6
commit b9fa14139a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/statistics/chart_widget.cpp
View file

@ -420,7 +420,11 @@ void ChartWidget::Footer::moveSide(bool left, float64 x) {
if (_width < (2 * w + mid)) { if (_width < (2 * w + mid)) {
return; return;
} else if (left) { } else if (left) {
const auto min = std::clamp(x, 0., _rightSide.min - w - mid); const auto rightLimit = _rightSide.min - w - mid;
const auto min = std::clamp(
x,
0.,
(rightLimit <= 0) ? _widthBetweenSides : rightLimit);
_leftSide = Limits{ .min = min, .max = min + w }; _leftSide = Limits{ .min = min, .max = min + w };
} else if (!left) { } else if (!left) {
const auto min = std::clamp(x, _leftSide.max + mid, _width); const auto min = std::clamp(x, _leftSide.max + mid, _width);

1
Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp
View file

@ -742,7 +742,6 @@ void StackLinearChartView::paintPieText(QPainter &p, const PaintContext &c) {
: (minScale) + percentage * (maxScale - minScale); : (minScale) + percentage * (maxScale - minScale);
const auto text = parts[k].percentageText; const auto text = parts[k].percentageText;
const auto textW = font->width(text); const auto textW = font->width(text);
const auto textH = font->height;
const auto textXShift = textW / 2.; const auto textXShift = textW / 2.;
const auto textYShift = textW / 2.; const auto textYShift = textW / 2.;
const auto textRectCenter = rectF.center() + QPointF( const auto textRectCenter = rectF.center() + QPointF(