MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved zoom out button to right side above chart.

This commit is contained in:
23rd 2023-10-03 16:16:39 +03:00 committed by John Preston
parent 10e3115c39
commit c20bd17029
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/statistics/chart_header_widget.cpp
View File

@ -12,6 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Statistic {
QString Header::title() const {
return _title.toString();
}
void Header::setTitle(QString title) {
_title.setText(st::statisticsHeaderTitleTextStyle, std::move(title));
}

1
Telegram/SourceFiles/statistics/chart_header_widget.h
View File

@ -15,6 +15,7 @@ class Header final : public Ui::RpWidget {
public:
using Ui::RpWidget::RpWidget;
[[nodiscard]] QString title() const;
void setTitle(QString title);
void setRightInfo(QString rightInfo);

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

@ -1260,6 +1260,7 @@ void ChartWidget::processLocalZoom(int xIndex) {
) | rpl::start_with_next([=](const QRect &g) {
header->setGeometry(g);
}, header->lifetime());
header->setTitle(_header->title());
header->setRightInfo(_chartData.getDayString(xIndex));
const auto enableMouse = [=](bool value) {
@ -1291,6 +1292,9 @@ void ChartWidget::processLocalZoom(int xIndex) {
header,
tr::lng_stats_zoom_out(),
st::statisticsHeaderButton);
zoomOutButton->moveToRight(
0,
(st::statisticsChartHeaderHeight - zoomOutButton->height()) / 2);
zoomOutButton->show();
zoomOutButton->setTextTransform(
Ui::RoundButton::TextTransform::NoTransform);
@ -1324,8 +1328,6 @@ void ChartWidget::processLocalZoom(int xIndex) {
Ui::Animations::ShowWidgets({ header });
zoomOutButton->moveToLeft(0, 0);
const auto finish = [=](const Limits &zoomLimitIndices) {
createMouseTracking();
_footer->xPercentageLimitsChange(
@ -1460,11 +1462,17 @@ void ChartWidget::setZoomedChartData(
const auto customHeader = Ui::CreateChild<Header>(
_zoomedChartWidget.get());
const auto xIndex = std::distance(
begin(_chartData.x),
ranges::find(_chartData.x, x));
if ((xIndex >= 0) && (xIndex < _chartData.x.size())) {
customHeader->setRightInfo(_chartData.getDayString(xIndex));
{
const auto xIndex = std::distance(
begin(_chartData.x),
ranges::find(_chartData.x, x));
customHeader->setTitle(_header->title());
if ((xIndex >= 0) && (xIndex < _chartData.x.size())) {
customHeader->setRightInfo(_chartData.getDayString(xIndex));
}
const auto &headerPadding = st::statisticsChartHeaderPadding;
customHeader->moveToLeft(headerPadding.left(), headerPadding.top());
customHeader->resizeToWidth(width() - rect::m::sum::h(headerPadding));
}
const auto zoomOutButton = Ui::CreateChild<Ui::RoundButton>(
@ -1473,6 +1481,9 @@ void ChartWidget::setZoomedChartData(
st::statisticsHeaderButton);
zoomOutButton->setTextTransform(
Ui::RoundButton::TextTransform::NoTransform);
zoomOutButton->moveToRight(
0,
(st::statisticsChartHeaderHeight - zoomOutButton->height()) / 2);
zoomOutButton->setClickedCallback([=] {
shownValue(
) | rpl::start_with_next([=](bool shown) {
@ -1486,13 +1497,6 @@ void ChartWidget::setZoomedChartData(
Ui::Animations::ShowWidgets({ _zoomedChartWidget.get(), customHeader });
Ui::Animations::HideWidgets({ this });
{
const auto &headerPadding = st::statisticsChartHeaderPadding;
customHeader->moveToLeft(headerPadding.left(), headerPadding.top());
customHeader->resizeToWidth(width() - rect::m::sum::h(headerPadding));
}
zoomOutButton->moveToLeft(0, 0);
}
rpl::producer<float64> ChartWidget::zoomRequests() {

2
Telegram/SourceFiles/statistics/statistics.style
View File

@ -68,7 +68,7 @@ statisticsHeaderDatesTextStyle: TextStyle(defaultTextStyle) {
}
statisticsHeaderButton: RoundButton(defaultLightButton) {
width: -14px;
height: statisticsChartHeaderHeight;
height: 20px;
textTop: 2px;
font: font(11px semibold);
}