ardour/livetrax
13
0
Fork 0
Code

canvastable: remove unused vars; rename others

Browse Source
This commit is contained in:
Paul Davis 2021-09-17 14:36:09 -06:00
parent 44b1cea54a
commit 47f7958714
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/canvas/table.cc
View File

@ -211,9 +211,9 @@ Table::compute (Rect const & within)
/* columns have a natural width */
Distance total_width = (c.natural_size.x / hspan) + c.padding.left + c.padding.right;
const Distance total_cell_width = (c.natural_size.x / hspan) + c.padding.left + c.padding.right;
col_info[col].natural_size = std::max (col_info[col].natural_size, total_width);
col_info[col].natural_size = std::max (col_info[col].natural_size, total_cell_width);
col_info[col].occupied = true;
}
@ -226,9 +226,9 @@ Table::compute (Rect const & within)
/* rows have a natural height */
Distance total_height = (c.natural_size.y / vspan) + c.padding.up + c.padding.down;
const Distance total_cell_height = (c.natural_size.y / vspan) + c.padding.up + c.padding.down;
row_info[row].natural_size = std::max (row_info[row].natural_size, total_height);
row_info[row].natural_size = std::max (row_info[row].natural_size, total_cell_height);
row_info[row].occupied = true;
if (c.row_options & PackExpand) {
@ -254,17 +254,11 @@ Table::compute (Rect const & within)
Distance natural_height = 0.;
Distance fixed_width = 0;
Distance fixed_height = 0;
uint32_t total_width_expanders = 0;
uint32_t total_height_expanders = 0;
uint32_t fixed_size_rows = 0;
uint32_t fixed_size_cols = 0;
for (auto & ai : row_info) {
if (ai.expanders) {
total_height_expanders++;
}
ai.natural_size += ai.spacing;
if (ai.user_size) {
@ -278,10 +272,6 @@ Table::compute (Rect const & within)
for (auto & ai : col_info) {
if (ai.expanders) {
total_width_expanders++;
}
ai.natural_size += ai.spacing;
if (ai.user_size) {