From 5e1b64285f403c79d29307b83ddb036b0c583f1f Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 30 Jan 2023 11:20:52 +0800 Subject: [PATCH] cabana: fixed the column selector is always hidden if settings.chart_column_count is 1 (#27146) fix column selector old-commit-hash: 9822f1b0b46c5d63290e3ef8b3f103d7aba13bd9 --- tools/cabana/chartswidget.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 580cce5521..8dde735a57 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -229,7 +229,7 @@ void ChartsWidget::setColumnCount(int n) { } void ChartsWidget::updateLayout() { - int n = column_count; + int n = columns_cb->count(); for (; n > 1; --n) { if ((n * CHART_MIN_WIDTH + (n - 1) * charts_layout->spacing()) < charts_layout->geometry().width()) break; } @@ -238,6 +238,7 @@ void ChartsWidget::updateLayout() { columns_lb_action->setVisible(show_column_cb); columns_cb_action->setVisible(show_column_cb); + n = std::min(column_count, n); for (int i = 0; i < charts.size(); ++i) { charts_layout->addWidget(charts[charts.size() - i - 1], i / n, i % n); }