summaryrefslogtreecommitdiff
path: root/res/fonts/conf.d
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2024-04-13 22:34:50 -0400
committerouwou <26526779+ouwou@users.noreply.github.com>2024-04-13 22:34:50 -0400
commit02fd49b0736f74cc22dc3c9b16d904334d017dce (patch)
tree4257dba34b011163fb0abb0af096c3982958aa8c /res/fonts/conf.d
parent565213450a891d728b3b46102e3c485cdfa86844 (diff)
parent5e382b11dce3892a3b6d2ea42bc3be0db79c2ef5 (diff)
downloadabaddon-portaudio-02fd49b0736f74cc22dc3c9b16d904334d017dce.tar.gz
abaddon-portaudio-02fd49b0736f74cc22dc3c9b16d904334d017dce.zip
Merge branch 'master' into stages
Diffstat (limited to 'res/fonts/conf.d')
-rw-r--r--res/fonts/conf.d/10-scale-bitmap-fonts.conf5
-rw-r--r--res/fonts/conf.d/55-emoji-prepend.conf2
2 files changed, 5 insertions, 2 deletions
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