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

SystemMonitor: Define graphs by ColorRole, not by Color

Browse source 
Currently, graphs are defined in terms of graph color. This means that
when the system palette is changed, the old colors are still used. We
switch to storing the color roles and looking up the palette colors on
paint events. We also define the graph line background color as the
graph color at half-transparency.
This commit is contained in:
Sahan Fernando 2021-02-14 20:04:38 +11:00 • committed by Andreas Kling
parent 6ee499aeb0
commit ca731e2cdd
3 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Applications/SystemMonitor/main.cpp
View file

@ -573,8 +573,6 @@ NonnullRefPtr<GUI::Widget> build_graphs_tab()
auto graphs_container = GUI::LazyWidget::construct();
graphs_container->on_first_show = [](GUI::LazyWidget& self) {
const auto system_palette = GUI::Application::the()->palette();
self.set_fill_with_background_color(true);
self.set_background_role(ColorRole::Button);
self.set_layout<GUI::VerticalBoxLayout>();
@ -589,13 +587,13 @@ NonnullRefPtr<GUI::Widget> build_graphs_tab()
auto& cpu_graph = cpu_graph_group_box.add<GraphWidget>();
cpu_graph.set_max(100);
cpu_graph.set_value_format(0, {
.line_color = system_palette.syntax_preprocessor_statement(),
.graph_color_role = ColorRole::SyntaxPreprocessorStatement,
.text_formatter = [](int value) {
return String::formatted("Total: {}%", value);
},
});
cpu_graph.set_value_format(1, {
.line_color = system_palette.syntax_preprocessor_value(),
.graph_color_role = ColorRole::SyntaxPreprocessorValue,
.text_formatter = [](int value) {
return String::formatted("Kernel: {}%", value);
},
@ -614,19 +612,19 @@ NonnullRefPtr<GUI::Widget> build_graphs_tab()
auto& memory_graph = memory_graph_group_box.add<GraphWidget>();
memory_graph.set_stack_values(true);
memory_graph.set_value_format(0, {
.line_color = system_palette.syntax_comment(),
.graph_color_role = ColorRole::SyntaxComment,
.text_formatter = [&memory_graph](int value) {
return String::formatted("Committed: {} KiB", value);
},
});
memory_graph.set_value_format(1, {
.line_color = system_palette.syntax_preprocessor_statement(),
.graph_color_role = ColorRole::SyntaxPreprocessorStatement,
.text_formatter = [&memory_graph](int value) {
return String::formatted("Allocated: {} KiB", value);
},
});
memory_graph.set_value_format(2, {
.line_color = system_palette.syntax_preprocessor_value(),
.graph_color_role = ColorRole::SyntaxPreprocessorValue,
.text_formatter = [&memory_graph](int value) {
return String::formatted("Kernel heap: {} KiB", value);
},