cabana: fixed the column selector is always hidden if settings.chart_column_count is 1 (#27146)

fix column selector
pull/27131/head
Dean Lee 2 years ago committed by GitHub
parent 7a485d4308
commit 9822f1b0b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      tools/cabana/chartswidget.cc

@ -229,7 +229,7 @@ void ChartsWidget::setColumnCount(int n) {
} }
void ChartsWidget::updateLayout() { void ChartsWidget::updateLayout() {
int n = column_count; int n = columns_cb->count();
for (; n > 1; --n) { for (; n > 1; --n) {
if ((n * CHART_MIN_WIDTH + (n - 1) * charts_layout->spacing()) < charts_layout->geometry().width()) break; 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_lb_action->setVisible(show_column_cb);
columns_cb_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) { for (int i = 0; i < charts.size(); ++i) {
charts_layout->addWidget(charts[charts.size() - i - 1], i / n, i % n); charts_layout->addWidget(charts[charts.size() - i - 1], i / n, i % n);
} }

Loading…
Cancel
Save