diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2024-04-13 22:34:50 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2024-04-13 22:34:50 -0400 |
| commit | 02fd49b0736f74cc22dc3c9b16d904334d017dce (patch) | |
| tree | 4257dba34b011163fb0abb0af096c3982958aa8c /res/fonts | |
| parent | 565213450a891d728b3b46102e3c485cdfa86844 (diff) | |
| parent | 5e382b11dce3892a3b6d2ea42bc3be0db79c2ef5 (diff) | |
| download | abaddon-portaudio-02fd49b0736f74cc22dc3c9b16d904334d017dce.tar.gz abaddon-portaudio-02fd49b0736f74cc22dc3c9b16d904334d017dce.zip | |
Merge branch 'master' into stages
Diffstat (limited to 'res/fonts')
| -rw-r--r-- | res/fonts/Twemoji-15.0.3.ttf | bin | 0 -> 7409592 bytes | |||
| -rw-r--r-- | res/fonts/TwitterColorEmoji.ttf | bin | 7656676 -> 0 bytes | |||
| -rw-r--r-- | res/fonts/conf.d/10-scale-bitmap-fonts.conf | 5 | ||||
| -rw-r--r-- | res/fonts/conf.d/55-emoji-prepend.conf | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/res/fonts/Twemoji-15.0.3.ttf b/res/fonts/Twemoji-15.0.3.ttf Binary files differnew file mode 100644 index 0000000..402a1d0 --- /dev/null +++ b/res/fonts/Twemoji-15.0.3.ttf diff --git a/res/fonts/TwitterColorEmoji.ttf b/res/fonts/TwitterColorEmoji.ttf Binary files differdeleted file mode 100644 index 3e41671..0000000 --- a/res/fonts/TwitterColorEmoji.ttf +++ /dev/null diff --git a/res/fonts/conf.d/10-scale-bitmap-fonts.conf b/res/fonts/conf.d/10-scale-bitmap-fonts.conf index b20b52e..b4e9cb4 100644 --- a/res/fonts/conf.d/10-scale-bitmap-fonts.conf +++ b/res/fonts/conf.d/10-scale-bitmap-fonts.conf @@ -12,7 +12,10 @@ <bool>false</bool> </test> <edit name="pixelsizefixupfactor" mode="assign"> - <double>0.15</double> + <divide> + <name target="pattern">pixelsize</name> + <name target="font" >pixelsize</name> + </divide> </edit> </match> <!-- diff --git a/res/fonts/conf.d/55-emoji-prepend.conf b/res/fonts/conf.d/55-emoji-prepend.conf index b56cebb..049e6c3 100644 --- a/res/fonts/conf.d/55-emoji-prepend.conf +++ b/res/fonts/conf.d/55-emoji-prepend.conf @@ -3,7 +3,7 @@ <fontconfig> <match> <edit name="family" mode="prepend" binding="weak"> - <string>Twitter Color Emoji</string> + <string>Twemoji 128</string> </edit> </match> </fontconfig>
\ No newline at end of file |