1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Description: Make Tulip load fonts from Debian's font packages rather bundled copies.
Author: James Turton <james@somecomputer.xyz>
Last-Update: 2025-08-28
Forwarded: no
--- a/library/tulip-ogl/src/TulipMaterialDesignIcons.cpp
+++ b/library/tulip-ogl/src/TulipMaterialDesignIcons.cpp
@@ -45,12 +45,14 @@ static inline void addIconCodePoint(cons
// code generated by generate_mdi_init_cpp_code.sh
#include "TulipInitMaterialDesignIcons.cpp"
+#define DEBIAN_MDI_FONT_DIR "/usr/share/fonts-materialdesignicons-webfont/fonts"
+
std::string TulipMaterialDesignIcons::getTTFLocation() {
- return string(tlp::TulipBitmapDir).append("materialdesignicons-webfont.ttf");
+ return DEBIAN_MDI_FONT_DIR "/materialdesignicons-webfont.ttf";
}
std::string TulipMaterialDesignIcons::getWOFF2Location() {
- return string(tlp::TulipBitmapDir).append("materialdesignicons-webfont.woff2");
+ return DEBIAN_MDI_FONT_DIR "/materialdesignicons-webfont.woff";
}
bool TulipMaterialDesignIcons::isIconSupported(const std::string &iconName) {
--- a/library/tulip-ogl/bitmaps/CMakeLists.txt
+++ b/library/tulip-ogl/bitmaps/CMakeLists.txt
@@ -1,13 +1,9 @@
-INSTALL(FILES fontb.ttf
- font.ttf
- fa-brands-400.ttf
+INSTALL(FILES fa-brands-400.ttf
fa-brands-400.woff2
fa-regular-400.ttf
fa-regular-400.woff2
fa-solid-900.ttf
fa-solid-900.woff2
- materialdesignicons-webfont.ttf
- materialdesignicons-webfont.woff2
halfCylinderTexture.png
cylinderTexture.png
roundTexture.png
|
