1
=== modified file 'examples/miral-shell/CMakeLists.txt'
2
--- examples/miral-shell/CMakeLists.txt	2017-10-20 13:39:42 +0000
3
+++ examples/miral-shell/CMakeLists.txt	2017-10-27 17:40:44 +0000
4
@@ -53,16 +53,6 @@
5
53
    titlebar_config.cpp         titlebar_config.h
53
    titlebar_config.cpp         titlebar_config.h
6
54
)
54
)
7
55
55
8
56
find_file(MIRAL_DEFAULT_FONT_FILE
9
57
    NAMES Ubuntu-B.ttf FreeSansBold.ttf
10
58
    DOC "Font to be used in titlebars by miral-shell"
11
59
    PATHS /usr/share/fonts/truetype/ubuntu-font-family # Ubuntu Ubuntu-B.ttf
12
60
          /usr/share/fonts/truetype/freefont           # Debian FreeSansBold.ttf
13
61
          /usr/share/fonts/gnu-free)                   # Fedora FreeSansBold.ttf
14
62
15
63
set_source_files_properties(titlebar_config.cpp PROPERTIES
16
64
    COMPILE_DEFINITIONS MIRAL_DEFAULT_FONT_FILE="${MIRAL_DEFAULT_FONT_FILE}")
17
65
18
66
pkg_check_modules(FREETYPE freetype2 REQUIRED)
56
pkg_check_modules(FREETYPE freetype2 REQUIRED)
19
67
target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})
57
target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})
20
68
target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)
58
target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)
21
69
59
22
=== modified file 'examples/miral-shell/titlebar_config.cpp'
23
--- examples/miral-shell/titlebar_config.cpp	2017-10-19 12:00:16 +0000
24
+++ examples/miral-shell/titlebar_config.cpp	2017-10-27 17:40:44 +0000
25
@@ -17,12 +17,30 @@
26
17
 */
17
 */
27
18
18
28
19
#include "titlebar_config.h"
19
#include "titlebar_config.h"
29
20
#include <unistd.h>
30
20
#include <mutex>
21
#include <mutex>
31
21
22
32
22
namespace
23
namespace
33
23
{
24
{
34
25
auto default_font() -> std::string
35
26
{
36
27
    for (std::string const file : { "Ubuntu-B.ttf", "FreeSansBold.ttf" })
37
28
    {
38
29
        for (auto const path : { "/usr/share/fonts/truetype/ubuntu-font-family/",   // Ubuntu Ubuntu-B.ttf
39
30
                                 "/usr/share/fonts/truetype/freefont/",             // Debian FreeSansBold.ttf
40
31
                                 "/usr/share/fonts/gnu-free/"})                     // Fedora FreeSansBold.ttf
41
32
        {
42
33
            auto const full_path = path + file;
43
34
            if (access(full_path.c_str(), R_OK) == 0)
44
35
                return full_path;
45
36
        }
46
37
    }
47
38
48
39
    return "/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf";
49
40
}
50
41
51
24
std::mutex mutex;
42
std::mutex mutex;
53
25
std::string font_file{MIRAL_DEFAULT_FONT_FILE};
43
std::string font_file{default_font()};
54
26
}
44
}
55
27
45
56
28
void titlebar::font_file(std::string const& font_file)
46
void titlebar::font_file(std::string const& font_file)
Status:	Rejected
Rejected by:	Michał Sawicz on 2017-11-02
Proposed branch:	lp:~alan-griffiths/mir/sync-fix-from-0.28.1-release
Merge into:	lp:mir
Prerequisite:	lp:~alan-griffiths/mir/fix-FTBFS
Diff against target:	56 lines (+19/-11) 2 files modified examples/miral-shell/CMakeLists.txt (+0/-10) examples/miral-shell/titlebar_config.cpp (+19/-1)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/sync-fix-from-0.28.1-release
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2017-10-27	Needs Resubmitting on 2017-11-02
Mir CI Bot	continuous-integration		Approve on 2017-10-27
Review via email: mp+332931@code.launchpad.net
1	=== modified file 'examples/miral-shell/CMakeLists.txt'
2	--- examples/miral-shell/CMakeLists.txt 2017-10-20 13:39:42 +0000
3	+++ examples/miral-shell/CMakeLists.txt 2017-10-27 17:40:44 +0000
4	@@ -53,16 +53,6 @@
5	53	titlebar_config.cpp titlebar_config.h	53	titlebar_config.cpp titlebar_config.h
6	54	)	54	)
7	55		55
8	56	find_file(MIRAL_DEFAULT_FONT_FILE
9	57	NAMES Ubuntu-B.ttf FreeSansBold.ttf
10	58	DOC "Font to be used in titlebars by miral-shell"
11	59	PATHS /usr/share/fonts/truetype/ubuntu-font-family # Ubuntu Ubuntu-B.ttf
12	60	/usr/share/fonts/truetype/freefont # Debian FreeSansBold.ttf
13	61	/usr/share/fonts/gnu-free) # Fedora FreeSansBold.ttf
14	62
15	63	set_source_files_properties(titlebar_config.cpp PROPERTIES
16	64	COMPILE_DEFINITIONS MIRAL_DEFAULT_FONT_FILE="${MIRAL_DEFAULT_FONT_FILE}")
17	65
18	66	pkg_check_modules(FREETYPE freetype2 REQUIRED)	56	pkg_check_modules(FREETYPE freetype2 REQUIRED)
19	67	target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})	57	target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})
20	68	target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)	58	target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)
21	69		59
22	=== modified file 'examples/miral-shell/titlebar_config.cpp'
23	--- examples/miral-shell/titlebar_config.cpp 2017-10-19 12:00:16 +0000
24	+++ examples/miral-shell/titlebar_config.cpp 2017-10-27 17:40:44 +0000
25	@@ -17,12 +17,30 @@
26	17	*/	17	*/
27	18		18
28	19	#include "titlebar_config.h"	19	#include "titlebar_config.h"
29			20	#include <unistd.h>
30	20	#include <mutex>	21	#include <mutex>
31	21		22
32	22	namespace	23	namespace
33	23	{	24	{
34			25	auto default_font() -> std::string
35			26	{
36			27	for (std::string const file : { "Ubuntu-B.ttf", "FreeSansBold.ttf" })
37			28	{
38			29	for (auto const path : { "/usr/share/fonts/truetype/ubuntu-font-family/", // Ubuntu Ubuntu-B.ttf
39			30	"/usr/share/fonts/truetype/freefont/", // Debian FreeSansBold.ttf
40			31	"/usr/share/fonts/gnu-free/"}) // Fedora FreeSansBold.ttf
41			32	{
42			33	auto const full_path = path + file;
43			34	if (access(full_path.c_str(), R_OK) == 0)
44			35	return full_path;
45			36	}
46			37	}
47			38
48			39	return "/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf";
49			40	}
50			41
51	24	std::mutex mutex;	42	std::mutex mutex;
53	25	std::string font_file{MIRAL_DEFAULT_FONT_FILE};	43	std::string font_file{default_font()};
54	26	}	44	}
55	27		45
56	28	void titlebar::font_file(std::string const& font_file)	46	void titlebar::font_file(std::string const& font_file)