Commit cfed101d authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by morgan
Browse files

squash! Bug 41043: Hardcode the UI font on Linux 

Bug 43141: Hardcode system-ui to Arimo.
parent 681f5728

gfx/thebes/gfxPlatformFontList.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2055,6 +2055,11 @@ static void GetSystemUIFontFamilies(const nsPresContext* aPresContext, 
#if defined(XP_MACOSX) || defined(MOZ_WIDGET_UIKIT)

    *aFamilies.AppendElement() = "-apple-system"_ns;

    return;

#elif defined(MOZ_WIDGET_GTK)

    // tor-browser#43141: Hardcode Arimo in case our custom fontconfig is

    // missing.

    *aFamilies.AppendElement() = "Arimo"_ns;

    return;

#elif !defined(MOZ_WIDGET_ANDROID)

    *aFamilies.AppendElement() = "sans-serif"_ns;

    return;

layout/base/nsLayoutUtils.cpp

+3 −1
Original line number Diff line number Diff line
@@ -9720,7 +9720,9 @@ static void GetSpoofedSystemFontForRFP(LookAndFeel::FontID aFontID, 
  // In general, Linux uses some sans-serif, but its size can vary between

  // 12px and 16px. We chose 15px because it is what Firefox is doing for the

  // UI font-size.

  aName = u"sans-serif"_ns;

  // tor-browser#43141: Hardcode Arimo in case our custom fontconfig is

  // missing.

  aName = u"Arimo"_ns;

  aStyle.size = 15;

#else

#  error "Unknown platform"