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

Spreadsheet: Treat an empty format string as "default"

Browse source
This commit is contained in:
AnotherTest 2020-09-25 16:37:25 +03:30 • committed by Andreas Kling
parent e250591ff3
commit a2efff9287
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/Spreadsheet/CellType/Numeric.cpp
View file

@ -44,7 +44,7 @@ String NumericCell::display(Cell& cell, const CellTypeMetadata& metadata) const
{ {
auto value = js_value(cell, metadata); auto value = js_value(cell, metadata);
String string; String string;
if (metadata.format.is_null()) if (metadata.format.is_empty())
string = value.to_string_without_side_effects(); string = value.to_string_without_side_effects();
else else
string = format_double(metadata.format.characters(), value.to_double(cell.sheet->interpreter())); string = format_double(metadata.format.characters(), value.to_double(cell.sheet->interpreter()));

4
Applications/Spreadsheet/CellTypeDialog.cpp
View file

@ -198,9 +198,9 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector<Position>& po
{ {
auto& checkbox = right_side.add<GUI::CheckBox>("Override display format"); auto& checkbox = right_side.add<GUI::CheckBox>("Override display format");
auto& editor = right_side.add<GUI::TextEditor>(); auto& editor = right_side.add<GUI::TextEditor>();
checkbox.set_checked(!m_format.is_null()); checkbox.set_checked(!m_format.is_empty());
editor.set_should_hide_unnecessary_scrollbars(true); editor.set_should_hide_unnecessary_scrollbars(true);
editor.set_enabled(!m_format.is_null()); editor.set_enabled(!m_format.is_empty());
editor.set_text(m_format); editor.set_text(m_format);
checkbox.set_preferred_size(0, 20); checkbox.set_preferred_size(0, 20);