3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[F] Fix incorrect cell width evaluation in case of invisible symbols

Browse Source
This commit is contained in:
seleznevae
2020-02-03 21:41:11 +03:00
parent 085405baa9
commit 3cc961f958
3 changed files with 142 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/fort.c
View File

@@ -7001,6 +7001,7 @@ f_status table_rows_and_cols_geometry(const ft_table_t *table,
return FT_ERROR;
}
size_t column_visible_width = 0;
size_t cols = 0;
size_t rows = 0;
int status = get_table_sizes(table, &rows, &cols);
@@ -7022,6 +7023,17 @@ f_status table_rows_and_cols_geometry(const ft_table_t *table,
for (col = 0; col < cols; ++col) {
col_width_arr[col] = 0;
size_t row = 0;
if (geom == INTERN_REPR_GEOMETRY) {
column_visible_width = 0;
for (row = 0; row < rows; ++row) {
const f_row_t *row_p = get_row_c(table, row);
const f_cell_t *cell = get_cell_c(row_p, col);
if (!cell)
continue;
size_t cell_vis_width = hint_width_cell(cell, &context, VISIBLE_GEOMETRY);
column_visible_width = MAX(column_visible_width, cell_vis_width);
}
}
for (row = 0; row < rows; ++row) {
const f_row_t *row_p = get_row_c(table, row);
const f_cell_t *cell = get_cell_c(row_p, col);
@@ -7049,6 +7061,11 @@ f_status table_rows_and_cols_geometry(const ft_table_t *table,
}
}
}
if (geom == INTERN_REPR_GEOMETRY &&
col_width_arr[col] > column_visible_width) {
col_width_arr[col] += column_visible_width;
}
}
if (combined_cells_found) {