mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 05:17:34 +00:00
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.
This commit is contained in:
parent
1a072a61fb
commit
b4d1390714
48 changed files with 152 additions and 115 deletions
|
@ -32,6 +32,7 @@
|
|||
#include <LibGUI/InputBox.h>
|
||||
#include <LibGUI/Label.h>
|
||||
#include <LibGfx/Font.h>
|
||||
#include <LibGfx/FontDatabase.h>
|
||||
|
||||
namespace HackStudio {
|
||||
|
||||
|
@ -77,7 +78,7 @@ EditorWrapper::~EditorWrapper()
|
|||
|
||||
void EditorWrapper::set_editor_has_focus(Badge<Editor>, bool focus)
|
||||
{
|
||||
m_filename_label->set_font(focus ? Gfx::Font::default_bold_font() : Gfx::Font::default_font());
|
||||
m_filename_label->set_font(focus ? Gfx::FontDatabase::default_bold_font() : Gfx::FontDatabase::default_font());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include <LibGUI/Button.h>
|
||||
#include <LibGUI/TableView.h>
|
||||
#include <LibGUI/TextBox.h>
|
||||
#include <LibGfx/FontDatabase.h>
|
||||
|
||||
namespace HackStudio {
|
||||
|
||||
|
@ -78,7 +79,7 @@ public:
|
|||
return Gfx::TextAlignment::CenterLeft;
|
||||
if (role == GUI::ModelRole::Font) {
|
||||
if (index.column() == Column::MatchedText)
|
||||
return Gfx::Font::default_fixed_width_font();
|
||||
return Gfx::FontDatabase::default_fixed_width_font();
|
||||
return {};
|
||||
}
|
||||
if (role == GUI::ModelRole::Display) {
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <LibGUI/ScrollBar.h>
|
||||
#include <LibGfx/Color.h>
|
||||
#include <LibGfx/Font.h>
|
||||
#include <LibGfx/FontDatabase.h>
|
||||
#include <LibGfx/Palette.h>
|
||||
|
||||
// #define DEBUG_DIFF
|
||||
|
@ -180,7 +181,7 @@ DiffViewer::DiffViewer(const String& original, const String& diff)
|
|||
|
||||
void DiffViewer::setup_properties()
|
||||
{
|
||||
set_font(Gfx::Font::default_fixed_width_font());
|
||||
set_font(Gfx::FontDatabase::default_fixed_width_font());
|
||||
set_background_role(ColorRole::Base);
|
||||
set_foreground_role(ColorRole::BaseText);
|
||||
}
|
||||
|
|
|
@ -75,6 +75,7 @@
|
|||
#include <LibGUI/TreeView.h>
|
||||
#include <LibGUI/Widget.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <LibGfx/FontDatabase.h>
|
||||
#include <LibThread/Lock.h>
|
||||
#include <LibThread/Thread.h>
|
||||
#include <LibVT/TerminalWidget.h>
|
||||
|
@ -718,7 +719,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent)
|
|||
auto& label = wrapper.add<GUI::Label>(text);
|
||||
label.set_fill_with_background_color(true);
|
||||
label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
label.set_font(Gfx::Font::default_bold_font());
|
||||
label.set_font(Gfx::FontDatabase::default_bold_font());
|
||||
label.set_fixed_height(16);
|
||||
wrapper.add_child(pane_widget);
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue