mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Fixed paint of rulers for stack chart view.
This commit is contained in:
parent
fcdd7ecd61
commit
d16cab30d4
2 changed files with 12 additions and 3 deletions
|
@ -937,7 +937,9 @@ void ChartWidget::setupChartArea() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_rulersView.paintRulers(p, chartRect);
|
if (!_areRulersAbove) {
|
||||||
|
_rulersView.paintRulers(p, chartRect);
|
||||||
|
}
|
||||||
|
|
||||||
const auto context = PaintContext{
|
const auto context = PaintContext{
|
||||||
_chartData,
|
_chartData,
|
||||||
|
@ -953,7 +955,9 @@ void ChartWidget::setupChartArea() {
|
||||||
_chartView->paint(p, context);
|
_chartView->paint(p, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
_rulersView.paintCaptionsToRulers(p, chartRect);
|
if (!_areRulersAbove) {
|
||||||
|
_rulersView.paintCaptionsToRulers(p, chartRect);
|
||||||
|
}
|
||||||
{
|
{
|
||||||
[[maybe_unused]] const auto o = ScopedPainterOpacity(
|
[[maybe_unused]] const auto o = ScopedPainterOpacity(
|
||||||
p,
|
p,
|
||||||
|
@ -979,6 +983,10 @@ void ChartWidget::setupChartArea() {
|
||||||
_details.widget->xIndex(),
|
_details.widget->xIndex(),
|
||||||
detailsAlpha);
|
detailsAlpha);
|
||||||
}
|
}
|
||||||
|
if (_areRulersAbove) {
|
||||||
|
_rulersView.paintRulers(p, chartRect);
|
||||||
|
_rulersView.paintCaptionsToRulers(p, chartRect);
|
||||||
|
}
|
||||||
|
|
||||||
p.setPen(st::windowSubTextFg);
|
p.setPen(st::windowSubTextFg);
|
||||||
PaintBottomLine(
|
PaintBottomLine(
|
||||||
|
@ -1445,6 +1453,7 @@ void ChartWidget::setChartData(
|
||||||
_chartView = CreateChartView(type);
|
_chartView = CreateChartView(type);
|
||||||
_chartView->setLinesFilterController(_linesFilterController);
|
_chartView->setLinesFilterController(_linesFilterController);
|
||||||
_rulersView.setChartData(_chartData, type, _linesFilterController);
|
_rulersView.setChartData(_chartData, type, _linesFilterController);
|
||||||
|
_areRulersAbove = (type == ChartViewType::Stack);
|
||||||
|
|
||||||
if (_chartData.isFooterHidden) {
|
if (_chartData.isFooterHidden) {
|
||||||
_footer->hide();
|
_footer->hide();
|
||||||
|
|
|
@ -162,7 +162,7 @@ private:
|
||||||
int captionIndicesOffset = 0;
|
int captionIndicesOffset = 0;
|
||||||
} _bottomLine;
|
} _bottomLine;
|
||||||
|
|
||||||
bool _useMinHeight = false;
|
bool _areRulersAbove = false;
|
||||||
|
|
||||||
std::shared_ptr<LinesFilterController> _linesFilterController;
|
std::shared_ptr<LinesFilterController> _linesFilterController;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue