RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed position of zoomed in slider in footer for stack linear chart.

This commit is contained in:
23rd 2023-09-26 16:43:35 +03:00 committed by John Preston
parent 6995fcafb5
commit c19a527872
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/statistics/chart_widget.cpp
View File

@ -479,8 +479,9 @@ void ChartWidget::Footer::paintEvent(QPaintEvent *e) {
}
void ChartWidget::Footer::setXPercentageLimits(const Limits &xLimits) {
const auto left = xLimits.min * width();
const auto right = xLimits.max * _width;
const auto left = xLimits.min * _widthBetweenSides;
const auto right = xLimits.max * _widthBetweenSides
+ st::statisticsChartFooterSideWidth;
moveSide(true, left);
moveSide(false, right);
fire();

4
Telegram/SourceFiles/statistics/view/stack_chart_common.cpp
View File

@ -39,6 +39,10 @@ Limits FindStackXIndicesFromRawXPercentages(
chartData.xPercentage[zoomedInLimitXIndices.min],
chartData.xPercentage[zoomedInLimitXIndices.max],
};
// Due to a specificity of the stack chart plotting,
// the right edge has a special offset to the left.
// This reduces the number of displayed points by 1,
// but allows the last point to be displayed.
const auto offset = (zoomLimit.max == 1.) ? 0 : -1;
const auto minIt = ranges::upper_bound(
chartData.xPercentage,

11
Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp
View File

@ -585,6 +585,7 @@ void StackLinearChartView::paintZoomedFooter(
const auto leftStart = c.rect.x() + sideW;
const auto &xPercentage = c.chartData.xPercentage;
auto previousX = leftStart;
// Read FindStackXIndicesFromRawXPercentages.
const auto offset = (xPercentage[zoomedEnd] == 1.) ? 0 : 1;
for (auto i = zoomedStart; i <= zoomedEnd; i++) {
auto sum = 0.;
@ -958,15 +959,21 @@ auto StackLinearChartView::maybeLocalZoom(
xPercentage[_transition.zoomedInLimitXIndices.max],
args.progress),
};
const auto oneDay = std::abs(xPercentage[localRangeIndex]
- xPercentage[localRangeIndex + ((xIndex == backIndex) ? -1 : 1)]);
// Read FindStackXIndicesFromRawXPercentages.
const auto offset = (_transition.zoomedInLimitXIndices.max == backIndex)
? -oneDay
: 0.;
const auto resultRange = Limits{
InterpolationRatio(
_transition.zoomedInLimit.min,
_transition.zoomedInLimit.max,
_transition.zoomedInRange.min),
_transition.zoomedInRange.min + oneDay * 0.25 + offset),
InterpolationRatio(
_transition.zoomedInLimit.min,
_transition.zoomedInLimit.max,
_transition.zoomedInRange.max),
_transition.zoomedInRange.max + oneDay * 0.75 + offset),
};
return { true, _transition.zoomedInLimitXIndices, resultRange };
}