aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2020-04-13 12:51:15 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2020-04-13 12:51:15 +0200
commitb3b363903f1cef2e41e47193ba397a478161a813 (patch)
treeb2b7584c39012bb2f660487261a1fe325fe2dbb1
parentfea907d823db14312f281f377956dd0e6cd57a8f (diff)
downloadmoony.lv2-b3b363903f1cef2e41e47193ba397a478161a813.tar.xz
meson: ship fira font when building w/o fontconfig.
-rw-r--r--VERSION2
-rw-r--r--meson.build40
-rw-r--r--plugin/d2tk_ui.c8
3 files changed, 42 insertions, 8 deletions
diff --git a/VERSION b/VERSION
index cd33d4b..f799442 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.31.43
+0.31.53
diff --git a/meson.build b/meson.build
index 924f802..73c0469 100644
--- a/meson.build
+++ b/meson.build
@@ -288,6 +288,46 @@ if build_next_ui
dependencies : d2tk_ui_deps,
install : true,
install_dir : inst_dir)
+
+ use_fontconfig = get_option('use-fontconfig')
+ if not use_fontconfig.enabled()
+ fira_sans_bold_ttf = d2tk.get_variable('fira_sans_bold_ttf')
+ fira_code_bold_ttf = d2tk.get_variable('fira_code_bold_ttf')
+ fira_code_light_ttf = d2tk.get_variable('fira_code_light_ttf')
+ fira_code_medium_ttf = d2tk.get_variable('fira_code_medium_ttf')
+ fira_code_regular_ttf = d2tk.get_variable('fira_code_regular_ttf')
+
+ configure_file(
+ input : fira_sans_bold_ttf,
+ output : 'FiraSans:bold.ttf',
+ copy : true,
+ install : true,
+ install_dir : inst_dir)
+ configure_file(
+ input : fira_code_bold_ttf,
+ output : 'FiraCode:bold.ttf',
+ copy : true,
+ install : true,
+ install_dir : inst_dir)
+ configure_file(
+ input : fira_code_light_ttf,
+ output : 'FiraCode:light.ttf',
+ copy : true,
+ install : true,
+ install_dir : inst_dir)
+ configure_file(
+ input : fira_code_medium_ttf,
+ output : 'FiraCode:medium.ttf',
+ copy : true,
+ install : true,
+ install_dir : inst_dir)
+ configure_file(
+ input : fira_code_regular_ttf,
+ output : 'FiraCode:regular.ttf',
+ copy : true,
+ install : true,
+ install_dir : inst_dir)
+ endif
endif
app = executable('moony_test', app_srcs,
diff --git a/plugin/d2tk_ui.c b/plugin/d2tk_ui.c
index d4052e3..9202402 100644
--- a/plugin/d2tk_ui.c
+++ b/plugin/d2tk_ui.c
@@ -929,13 +929,7 @@ _idle(LV2UI_Handle instance)
d2tk_base_t *base = d2tk_frontend_get_base(handle->dpugl);
d2tk_style_t style = *d2tk_base_get_default_style(base);
- /*
- style.fill_color[D2TK_TRIPLE_ACTIVE] = handle.dark_reddest;
- style.fill_color[D2TK_TRIPLE_ACTIVE_HOT] = handle.light_reddest;
- style.fill_color[D2TK_TRIPLE_ACTIVE_FOCUS] = handle.dark_reddest;
- style.fill_color[D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = handle.light_reddest;
- */
- style.font_face = "FiraCode-Regular.ttf";
+ style.font_face = "FiraCode:regular";
d2tk_base_set_style(base, &style);
if(d2tk_frontend_step(handle->dpugl))