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

Ladybird: Use standard font paths in FontPluginQt

Browse source 
This makes vector fonts load on macOS, where /usr/share/fonts doesn't
exist and Ladybird would only load the bitmap fonts from ./res/fonts
in the SerenityOS resource root directory.
Additionally, fonts in {/usr/share/local,~/.local}/fonts are now loaded
on Linux.
This commit is contained in:
Linus Groh 2023-01-11 20:34:59 +00:00
parent c5cadca542
commit f49a65cb28
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ladybird/FontPluginQt.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org> * Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2023, Linus Groh <linusg@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -8,6 +9,8 @@
#include "FontPluginQt.h" #include "FontPluginQt.h"
#include <AK/DeprecatedString.h> #include <AK/DeprecatedString.h>
#include <AK/String.h>
#include <LibCore/StandardPaths.h>
#include <LibGfx/Font/FontDatabase.h> #include <LibGfx/Font/FontDatabase.h>
#include <QFont> #include <QFont>
#include <QFontInfo> #include <QFontInfo>
@ -21,8 +24,9 @@ FontPluginQt::FontPluginQt()
// Load the default SerenityOS fonts... // Load the default SerenityOS fonts...
Gfx::FontDatabase::set_default_fonts_lookup_path(DeprecatedString::formatted("{}/res/fonts", s_serenity_resource_root)); Gfx::FontDatabase::set_default_fonts_lookup_path(DeprecatedString::formatted("{}/res/fonts", s_serenity_resource_root));
// ...and also anything we can find in /usr/share/fonts // ...and also anything we can find in the system's font directories
Gfx::FontDatabase::the().load_all_fonts_from_path("/usr/share/fonts"); for (auto const& path : Core::StandardPaths::font_directories().release_value_but_fixme_should_propagate_errors())
Gfx::FontDatabase::the().load_all_fonts_from_path(path.to_deprecated_string());
Gfx::FontDatabase::set_default_font_query("Katica 10 400 0"); Gfx::FontDatabase::set_default_font_query("Katica 10 400 0");
Gfx::FontDatabase::set_fixed_width_font_query("Csilla 10 400 0"); Gfx::FontDatabase::set_fixed_width_font_query("Csilla 10 400 0");