diff options
| author | Stephan Unverwerth <s.unverwerth@gmx.de> | 2020-12-29 18:25:13 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-12-30 20:40:30 +0100 |
| commit | b4d13907148f2790482df5608b4e6c4ae6a68bc8 (patch) | |
| tree | 40986208bd40ca15cdfa68e970518413929edce2 /Applications/Calendar | |
| parent | 1a072a61fb88425e0e14d30a9c9805598c552cb7 (diff) | |
| download | serenity-b4d13907148f2790482df5608b4e6c4ae6a68bc8.zip | |
LibGFX: Move default_xxx_font() methods from Font to FontDatabase
When we have an abstract font class it makes no sense to keep
these methods in the Font class.
Diffstat (limited to 'Applications/Calendar')
| -rw-r--r-- | Applications/Calendar/AddEventDialog.cpp | 3 | ||||
| -rw-r--r-- | Applications/Calendar/main.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Applications/Calendar/AddEventDialog.cpp b/Applications/Calendar/AddEventDialog.cpp index c3a427c9c1..dbb70d33c1 100644 --- a/Applications/Calendar/AddEventDialog.cpp +++ b/Applications/Calendar/AddEventDialog.cpp @@ -38,6 +38,7 @@ #include <LibGUI/Window.h> #include <LibGfx/Color.h> #include <LibGfx/Font.h> +#include <LibGfx/FontDatabase.h> static const char* short_month_names[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", @@ -65,7 +66,7 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, Window* parent_window) auto& add_label = top_container.add<GUI::Label>("Add title & date:"); add_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); add_label.set_fixed_height(14); - add_label.set_font(Gfx::Font::default_bold_font()); + add_label.set_font(Gfx::FontDatabase::default_bold_font()); auto& event_title_textbox = top_container.add<GUI::TextBox>(); event_title_textbox.set_fixed_height(20); diff --git a/Applications/Calendar/main.cpp b/Applications/Calendar/main.cpp index 81840c4fe4..95dec9d301 100644 --- a/Applications/Calendar/main.cpp +++ b/Applications/Calendar/main.cpp @@ -40,6 +40,7 @@ #include <LibGfx/Bitmap.h> #include <LibGfx/Color.h> #include <LibGfx/Font.h> +#include <LibGfx/FontDatabase.h> #include <stdio.h> int main(int argc, char** argv) @@ -136,7 +137,7 @@ int main(int argc, char** argv) selected_calendar_button = toolbar.add<GUI::Button>(calendar_widget.selected_calendar_text()); selected_calendar_button->set_fixed_width(70); selected_calendar_button->set_button_style(Gfx::ButtonStyle::CoolBar); - selected_calendar_button->set_font(Gfx::Font::default_bold_fixed_width_font()); + selected_calendar_button->set_font(Gfx::FontDatabase::default_bold_fixed_width_font()); selected_calendar_button->on_click = [&](auto) { calendar_widget.toggle_mode(); selected_calendar_button->set_text(calendar_widget.selected_calendar_text()); |