RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:17:35 +00:00
Code Issues Activity Actions

Spreadsheet: Setup and prepare for cell types

Browse source 
This commit adds a generic interface for cell types and hooks it up.
There is no way to set these from the UI, and so they're not saved
anywhere yet.
Also implicitly converts numeric values (strictly integers) to numeric
javascript values, as numbery-looking + numbery-looking === string is
not very interesting. :^)
This commit is contained in:
AnotherTest 2020-08-28 17:55:06 +04:30 • committed by Andreas Kling
parent 5715ed3dd6
commit 6614ee703b
13 changed files with 468 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Applications/Spreadsheet/SpreadsheetModel.cpp
View file

@ -50,34 +50,33 @@ GUI::Variant SheetModel::data(const GUI::ModelIndex& index, GUI::ModelRole role)
return {};
if (role == GUI::ModelRole::Display) {
const auto* value = m_sheet->at({ m_sheet->column(index.column()), (size_t)index.row() });
if (!value)
const auto* cell = m_sheet->at({ m_sheet->column(index.column()), (size_t)index.row() });
if (!cell)
return String::empty();
if (value->kind == Spreadsheet::Cell::Formula) {
if (auto object = as_error(value->evaluated_data)) {
if (cell->kind == Spreadsheet::Cell::Formula) {
if (auto object = as_error(cell->evaluated_data)) {
StringBuilder builder;
auto error = object->get("message").to_string_without_side_effects();
builder.append("Error: ");
builder.append(error);
return builder.to_string();
}
return value->evaluated_data.is_empty() ? "" : value->evaluated_data.to_string_without_side_effects();
}
return value->data;
return cell->typed_display();
}
if (role == GUI::ModelRole::TextAlignment)
return {};
if (role == GUI::ModelRole::ForegroundColor) {
const auto* value = m_sheet->at({ m_sheet->column(index.column()), (size_t)index.row() });
if (!value)
const auto* cell = m_sheet->at({ m_sheet->column(index.column()), (size_t)index.row() });
if (!cell)
return {};
if (value->kind == Spreadsheet::Cell::Formula) {
if (as_error(value->evaluated_data))
if (cell->kind == Spreadsheet::Cell::Formula) {
if (as_error(cell->evaluated_data))
return Color(Color::Red);
}