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

LibGfx: Move FontDatabase from LibGUI to LibGfx

Browse source 
Not sure why I put this into LibGUI in the first place.
This commit is contained in:
Andreas Kling 2020-10-31 10:18:49 +01:00
parent e569f7fd1c
commit 982e066100
13 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Applications/HexEditor/HexEditor.cpp
View file

@ -28,7 +28,6 @@
#include <AK/StringBuilder.h>
#include <LibGUI/Action.h>
#include <LibGUI/Clipboard.h>
#include <LibGUI/FontDatabase.h>
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>

1
Applications/HexEditor/HexEditorWidget.cpp
View file

@ -33,7 +33,6 @@
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h>
#include <LibGUI/FilePicker.h>
#include <LibGUI/FontDatabase.h>
#include <LibGUI/InputBox.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>

4
Applications/Terminal/main.cpp
View file

@ -30,7 +30,7 @@
#include <LibGUI/ActionGroup.h>
#include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/FontDatabase.h>
#include <LibGfx/FontDatabase.h>
#include <LibGUI/GroupBox.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
@ -330,7 +330,7 @@ int main(int argc, char** argv)
GUI::ActionGroup font_action_group;
font_action_group.set_exclusive(true);
auto& font_menu = menubar->add_menu("Font");
GUI::FontDatabase::the().for_each_fixed_width_font([&](const Gfx::Font& font) {
Gfx::FontDatabase::the().for_each_fixed_width_font([&](const Gfx::Font& font) {
auto action = GUI::Action::create_checkable(font.qualified_name(), [&](auto&) {
terminal.set_font(font);
config->write_entry("Text", "Font", font.qualified_name());

4
Applications/TextEditor/TextEditorWidget.cpp
View file

@ -41,7 +41,6 @@
#include <LibGUI/Button.h>
#include <LibGUI/CppSyntaxHighlighter.h>
#include <LibGUI/FilePicker.h>
#include <LibGUI/FontDatabase.h>
#include <LibGUI/INISyntaxHighlighter.h>
#include <LibGUI/JSSyntaxHighlighter.h>
#include <LibGUI/Menu.h>
@ -55,6 +54,7 @@
#include <LibGUI/ToolBar.h>
#include <LibGUI/ToolBarContainer.h>
#include <LibGfx/Font.h>
#include <LibGfx/FontDatabase.h>
#include <LibMarkdown/Document.h>
#include <LibWeb/OutOfProcessWebView.h>
#include <string.h>
@ -396,7 +396,7 @@ TextEditorWidget::TextEditorWidget()
font_actions.set_exclusive(true);
auto& font_menu = view_menu.add_submenu("Font");
GUI::FontDatabase::the().for_each_fixed_width_font([&](const Gfx::Font& font) {
Gfx::FontDatabase::the().for_each_fixed_width_font([&](const Gfx::Font& font) {
auto action = GUI::Action::create_checkable(font.qualified_name(), [&](auto&) {
m_editor->set_font(font);
m_editor->update();