smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

canvastable: change some variable names; don't add per-col/row spacing twice

Browse source
This commit is contained in:
Paul Davis 2021-10-02 17:09:01 -06:00
parent df5699b03e
commit a8cc0be45c
1 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
libs/canvas/table.cc
View file

@ -289,52 +289,48 @@ Table::compute (Rect const & within)
Distance total_natural_width = 0; Distance total_natural_width = 0;
Distance total_natural_height = 0; Distance total_natural_height = 0;
for (auto & ai : row_info) { for (auto & row : row_info) {
ai.natural_size += ai.spacing; if (row.user_size) {
highest_row_height = std::max (highest_row_height, row.user_size);
if (ai.user_size) { inelastic_height += row.user_size;
highest_row_height = std::max (highest_row_height, ai.user_size);
inelastic_height += ai.user_size;
inelastic_cols++; inelastic_cols++;
if (!row_homogenous) { if (!row_homogenous) {
total_natural_height += ai.user_size; total_natural_height += row.user_size;
} }
} else { } else {
if (ai.expanders == 0 && ai.shrinkers == 0) { if (row.expanders == 0 && row.shrinkers == 0) {
inelastic_rows++; inelastic_rows++;
inelastic_height += ai.natural_size; inelastic_height += row.natural_size;
} }
highest_row_height = std::max (highest_row_height, ai.natural_size); highest_row_height = std::max (highest_row_height, row.natural_size);
if (!row_homogenous) { if (!row_homogenous) {
total_natural_height += ai.natural_size; total_natural_height += row.natural_size;
} }
} }
} }
for (auto & ai : col_info) { for (auto & col : col_info) {
ai.natural_size += ai.spacing; if (col.user_size) {
widest_column_width = std::max (widest_column_width, col.user_size);
if (ai.user_size) { inelastic_width += col.user_size;
widest_column_width = std::max (widest_column_width, ai.user_size);
inelastic_width += ai.user_size;
inelastic_cols++; inelastic_cols++;
if (!col_homogenous) { if (!col_homogenous) {
total_natural_width += ai.user_size; total_natural_width += col.user_size;
} }
} else { } else {
if (ai.expanders == 0 && ai.shrinkers == 0) { if (col.expanders == 0 && col.shrinkers == 0) {
inelastic_cols++; inelastic_cols++;
inelastic_width += ai.natural_size; inelastic_width += col.natural_size;
} }
widest_column_width = std::max (widest_column_width, ai.natural_size); widest_column_width = std::max (widest_column_width, col.natural_size);
if (!col_homogenous) { if (!col_homogenous) {
total_natural_width += ai.natural_size; total_natural_width += col.natural_size;
} }
} }
} }
@ -361,17 +357,17 @@ Table::compute (Rect const & within)
if (DEBUG_ENABLED(DEBUG::CanvasTable)) { if (DEBUG_ENABLED(DEBUG::CanvasTable)) {
DEBUG_STR_DECL(a); DEBUG_STR_DECL(a);
int n = 0; int n = 0;
for (auto& ai : row_info) { for (auto const & row : row_info) {
DEBUG_STR_APPEND(a, string_compose ("row %1: height %2\n", n+1, ai.natural_size)); DEBUG_STR_APPEND(a, string_compose ("row %1: height %2\n", n+1, row.natural_size));
++n; ++n;
} }
DEBUG_TRACE (DEBUG::CanvasTable, DEBUG_STR(a).str()); DEBUG_TRACE (DEBUG::CanvasTable, DEBUG_STR(a).str());
DEBUG_STR_DECL(b); DEBUG_STR_DECL(b);
n = 0; n = 0;
for (auto& ai : col_info) { for (auto const & col : col_info) {
DEBUG_STR_APPEND(b, string_compose ("col %1: width %2\n", n, ai.natural_size)); DEBUG_STR_APPEND(b, string_compose ("col %1: width %2\n", n, col.natural_size));
++n; ++n;
} }
DEBUG_TRACE (DEBUG::CanvasTable, DEBUG_STR(b).str()); DEBUG_TRACE (DEBUG::CanvasTable, DEBUG_STR(b).str());