fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-01-02 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spreadsheet: Allow cells to optionally have static fg/bg colors

Browse Source
This commit is contained in:
AnotherTest
2020-09-12 15:29:58 +04:30
committed by Andreas Kling
parent 1674903dcc
commit 8fa385f774
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Applications/Spreadsheet/CellType/Type.h
View File

@@ -29,6 +29,7 @@
#include "../Forward.h"
#include <AK/Forward.h>
#include <AK/String.h>
#include <LibGfx/Color.h>
#include <LibGfx/TextAlignment.h>
#include <LibJS/Forward.h>
@@ -38,6 +39,8 @@ struct CellTypeMetadata {
int length { -1 };
String format;
Gfx::TextAlignment alignment { Gfx::TextAlignment::CenterRight };
Optional<Gfx::Color> static_foreground_color;
Optional<Gfx::Color> static_background_color;
};
class CellType {

2
Applications/Spreadsheet/CellTypeDialog.h
View File

@@ -60,6 +60,8 @@ private:
String m_format;
HorizontalAlignment m_horizontal_alignment { HorizontalAlignment::Right };
VerticalAlignment m_vertical_alignment { VerticalAlignment::Center };
Optional<Color> m_static_foreground_color;
Optional<Color> m_static_background_color;
};
}

14
Applications/Spreadsheet/SpreadsheetModel.cpp
View File

@@ -85,6 +85,20 @@ GUI::Variant SheetModel::data(const GUI::ModelIndex& index, GUI::ModelRole role)
return Color(Color::Red);
}
if (auto color = cell->type_metadata().static_foreground_color; color.has_value())
return color.value();
return {};
}
if (role == GUI::ModelRole::BackgroundColor) {
const auto* cell = m_sheet->at({ m_sheet->column(index.column()), (size_t)index.row() });
if (!cell)
return {};
if (auto color = cell->type_metadata().static_background_color; color.has_value())
return color.value();
return {};
}