sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Correct height/width of cells with different font sizes

Browse Source
This commit is contained in:
Nicolás Hatcher
2025-02-26 23:22:05 +01:00
committed by Nicolás Hatcher Andrés
parent 409b77c210
commit f9c9467e6c
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/test/user_model/test_row_column.rs
View File

@@ -170,7 +170,7 @@ fn row_heigh_increases_automatically() {
model
.set_user_input(0, 1, 1, "My home in Canada had horses\nAnd monkeys!")
.unwrap();
assert_eq!(model.get_row_height(0, 1), Ok(2.0 * DEFAULT_ROW_HEIGHT));
assert_eq!(model.get_row_height(0, 1), Ok(40.5));
}
#[test]

10
base/src/user_model/common.rs
View File

@@ -6,7 +6,7 @@ use csv::{ReaderBuilder, WriterBuilder};
use serde::{Deserialize, Serialize};
use crate::{
constants::{self, DEFAULT_ROW_HEIGHT, LAST_COLUMN, LAST_ROW},
constants::{self, LAST_COLUMN, LAST_ROW},
expressions::{
types::{Area, CellReferenceIndex},
utils::{is_valid_column_number, is_valid_row},
@@ -430,10 +430,14 @@ impl UserModel {
new_value: value.to_string(),
old_value: Box::new(old_value),
}];
let style = self.model.get_style_for_cell(sheet, row, column)?;
let line_count = value.split('\n').count();
let line_count = value.split('\n').count() as f64;
let row_height = self.model.get_row_height(sheet, row)?;
let cell_height = (line_count as f64) * DEFAULT_ROW_HEIGHT;
// This is in sync with the front-end auto fit row
let font_size = style.font.sz as f64;
let line_height = font_size * 1.5;
let cell_height = (line_count - 1.0) * line_height + 8.0 + font_size;
if cell_height > row_height {
diff_list.push(Diff::SetRowHeight {
sheet,