UPDATE: Text spills now to adjacent cells if needed
This commit is contained in:
committed by
Nicolás Hatcher Andrés
parent
107fc99409
commit
9852ce2504
@@ -13,8 +13,8 @@ use crate::{
|
||||
},
|
||||
model::Model,
|
||||
types::{
|
||||
Alignment, BorderItem, CellType, Col, HorizontalAlignment, SheetProperties, SheetState,
|
||||
Style, VerticalAlignment,
|
||||
Alignment, BorderItem, Cell, CellType, Col, HorizontalAlignment, SheetProperties,
|
||||
SheetState, Style, VerticalAlignment,
|
||||
},
|
||||
utils::is_valid_hex_color,
|
||||
};
|
||||
@@ -1602,6 +1602,64 @@ impl UserModel {
|
||||
Ok(self.model.workbook.worksheet(sheet)?.show_grid_lines)
|
||||
}
|
||||
|
||||
/// Returns the largest column in the row less than a column whose cell has a non empty value.
|
||||
/// If the row is empty, it returns `None`.
|
||||
/// This is useful when rendering a part of a worksheet to know which cells spill over
|
||||
pub fn get_last_non_empty_in_row_before_column(
|
||||
&self,
|
||||
sheet: u32,
|
||||
row: i32,
|
||||
column: i32,
|
||||
) -> Result<Option<i32>, String> {
|
||||
let worksheet = self.model.workbook.worksheet(sheet)?;
|
||||
let data = worksheet.sheet_data.get(&row);
|
||||
if let Some(row_data) = data {
|
||||
let mut last_column = None;
|
||||
let mut columns: Vec<i32> = row_data.keys().copied().collect();
|
||||
columns.sort_unstable();
|
||||
for col in columns {
|
||||
if col < column {
|
||||
if let Some(cell) = worksheet.cell(row, col) {
|
||||
if matches!(cell, Cell::EmptyCell { .. }) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
last_column = Some(col);
|
||||
}
|
||||
}
|
||||
Ok(last_column)
|
||||
} else {
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the largest column in the row greater than a column whose cell has a non empty value.
|
||||
pub fn get_first_non_empty_in_row_after_column(
|
||||
&self,
|
||||
sheet: u32,
|
||||
row: i32,
|
||||
column: i32,
|
||||
) -> Result<Option<i32>, String> {
|
||||
let worksheet = self.model.workbook.worksheet(sheet)?;
|
||||
let data = worksheet.sheet_data.get(&row);
|
||||
if let Some(row_data) = data {
|
||||
let mut columns: Vec<i32> = row_data.keys().copied().collect();
|
||||
// We sort the keys to ensure we are going from left to right
|
||||
columns.sort_unstable();
|
||||
for col in columns {
|
||||
if col > column {
|
||||
if let Some(cell) = worksheet.cell(row, col) {
|
||||
if matches!(cell, Cell::EmptyCell { .. }) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
return Ok(Some(col));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
/// Returns a copy of the selected area
|
||||
pub fn copy_to_clipboard(&self) -> Result<Clipboard, String> {
|
||||
let selected_area = self.get_selected_view();
|
||||
|
||||
Reference in New Issue
Block a user