0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Ladybird: Explicitly set the font family for CSS generic fonts

Browse source 
We currently query Qt for system fonts using QFont::setStyleHint(). The
docs from Qt have the following note regarding this API on X11:

    Qt does not support style hints on X11 since this information is not
    provided by the window system.

This prevents any monospace font from working on X11 systems. For now,
work around this by specifying the font-family for fonts which Qt has
listed as mapping to a CSS generic font-family.
This commit is contained in:
Timothy Flynn 2023-04-26 08:17:40 -04:00 • committed by Andreas Kling
parent 9fe6dcb50b
commit d44df16704
Notes: sideshowbarker 2024-07-17 02:23:25 +09:00
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Ladybird/FontPluginQt.cpp
View file

@ -68,9 +68,19 @@ void FontPluginQt::update_generic_fonts()
m_generic_font_names.resize(static_cast<size_t>(Web::Platform::GenericFont::__Count));
auto update_mapping = [&](Web::Platform::GenericFont generic_font, QFont::StyleHint qfont_style_hint, Vector<DeprecatedString> fallbacks = {}) {
auto update_mapping = [&](Web::Platform::GenericFont generic_font, QFont::StyleHint qfont_style_hint, ReadonlySpan<DeprecatedString> fallbacks) {
QFont qt_font;
qt_font.setStyleHint(qfont_style_hint);
// NOTE: This is a workaround for setStyleHint being a no-op on X11 systems. See:
// https://doc.qt.io/qt-6/qfont.html#setStyleHint
if (generic_font == Web::Platform::GenericFont::Monospace)
qt_font.setFamily("monospace");
else if (generic_font == Web::Platform::GenericFont::Fantasy)
qt_font.setFamily("fantasy");
else if (generic_font == Web::Platform::GenericFont::Cursive)
qt_font.setFamily("cursive");
QFontInfo qt_info(qt_font);
auto qt_font_family = qt_info.family();