morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser
Commits:
-
b3c475ab
by Pier Angelo Vendrame at 2024-09-16T17:42:36+00:00
2 changed files:
Changes:
| ... | ... | @@ -2055,6 +2055,11 @@ static void GetSystemUIFontFamilies(const nsPresContext* aPresContext, |
| 2055 | 2055 | #if defined(XP_MACOSX) || defined(MOZ_WIDGET_UIKIT)
|
| 2056 | 2056 | *aFamilies.AppendElement() = "-apple-system"_ns;
|
| 2057 | 2057 | return;
|
| 2058 | +#elif defined(MOZ_WIDGET_GTK)
|
|
| 2059 | + // tor-browser#43141: Hardcode Arimo in case our custom fontconfig is
|
|
| 2060 | + // missing.
|
|
| 2061 | + *aFamilies.AppendElement() = "Arimo"_ns;
|
|
| 2062 | + return;
|
|
| 2058 | 2063 | #elif !defined(MOZ_WIDGET_ANDROID)
|
| 2059 | 2064 | *aFamilies.AppendElement() = "sans-serif"_ns;
|
| 2060 | 2065 | return;
|
| ... | ... | @@ -9720,7 +9720,9 @@ static void GetSpoofedSystemFontForRFP(LookAndFeel::FontID aFontID, |
| 9720 | 9720 | // In general, Linux uses some sans-serif, but its size can vary between
|
| 9721 | 9721 | // 12px and 16px. We chose 15px because it is what Firefox is doing for the
|
| 9722 | 9722 | // UI font-size.
|
| 9723 | - aName = u"sans-serif"_ns;
|
|
| 9723 | + // tor-browser#43141: Hardcode Arimo in case our custom fontconfig is
|
|
| 9724 | + // missing.
|
|
| 9725 | + aName = u"Arimo"_ns;
|
|
| 9724 | 9726 | aStyle.size = 15;
|
| 9725 | 9727 | #else
|
| 9726 | 9728 | # error "Unknown platform"
|