Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a font & location for the "wallpaper" that works on Fedora "rawhide" #1386

Merged
merged 1 commit into from Mar 24, 2020
Merged

Add a font & location for the "wallpaper" that works on Fedora "rawhide" #1386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions examples/example-server-lib/wallpaper_config.cpp
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright © 2016-2019 Canonical Ltd.
* Copyright © 2016-2020 Canonical Ltd.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 or 3 as
Expand All @@ -24,12 +24,13 @@ namespace
{
auto default_font() -> std::string
{
for (std::string const file : { "Ubuntu-B.ttf", "FreeSansBold.ttf" })
for (std::string const file : { "Ubuntu-B.ttf", "FreeSansBold.ttf", "LiberationSans-Bold.ttf" })
{
for (auto const path : { "/usr/share/fonts/truetype/ubuntu-font-family/", // Ubuntu < 18.04 Ubuntu-B.ttf
"/usr/share/fonts/truetype/ubuntu/", // Ubuntu >= 18.04 Ubuntu-B.ttf
"/usr/share/fonts/truetype/freefont/", // Debian FreeSansBold.ttf
"/usr/share/fonts/gnu-free/", // Fedora FreeSansBold.ttf
"/usr/share/fonts/liberation-sans/", // Fedora LiberationSans-Bold.ttf
"/usr/share/fonts/TTF/"}) // Arch Ubuntu-B.ttf
{
auto const full_path = path + file;
Expand Down