diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2020-09-20 17:34:27 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2020-09-20 17:34:27 +0300 |
commit | fabff758122481dab88d13258db191980a90b678 (patch) | |
tree | d338c8476a654d5bb1a6b76716806a11211a8beb /src/ui/text.c | |
parent | 268dbf7abac43b1e937beacabb3e7769f71c1249 (diff) |
Text: Japanese font sized for UI text
This font is needed for example for tab titles where there are japanese glyphs.
Diffstat (limited to 'src/ui/text.c')
-rw-r--r-- | src/ui/text.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/ui/text.c b/src/ui/text.c index 1e714320..63b15572 100644 --- a/src/ui/text.c +++ b/src/ui/text.c | |||
@@ -198,6 +198,7 @@ static void initFonts_Text_(iText *d) { | |||
198 | { &fontNotoEmojiRegular_Embedded, textSize * 2.000f, hugeSymbols_FontId }, | 198 | { &fontNotoEmojiRegular_Embedded, textSize * 2.000f, hugeSymbols_FontId }, |
199 | { &fontNotoEmojiRegular_Embedded, textSize * 0.866f, smallSymbols_FontId }, | 199 | { &fontNotoEmojiRegular_Embedded, textSize * 0.866f, smallSymbols_FontId }, |
200 | /* japanese fonts */ | 200 | /* japanese fonts */ |
201 | { &fontKosugiMaruRegular_Embedded, fontSize_UI, defaultSymbols_FontId }, | ||
201 | { &fontKosugiMaruRegular_Embedded, textSize * 0.666f, smallSymbols_FontId }, | 202 | { &fontKosugiMaruRegular_Embedded, textSize * 0.666f, smallSymbols_FontId }, |
202 | { &fontKosugiMaruRegular_Embedded, textSize, symbols_FontId }, | 203 | { &fontKosugiMaruRegular_Embedded, textSize, symbols_FontId }, |
203 | { &fontKosugiMaruRegular_Embedded, textSize * 1.200f, mediumSymbols_FontId }, | 204 | { &fontKosugiMaruRegular_Embedded, textSize * 1.200f, mediumSymbols_FontId }, |
@@ -219,14 +220,17 @@ static void initFonts_Text_(iText *d) { | |||
219 | /* Everything defaults to the regular sized japanese font, so these are just | 220 | /* Everything defaults to the regular sized japanese font, so these are just |
220 | the other sizes. */ | 221 | the other sizes. */ |
221 | /* TODO: Add these to the table above... */ | 222 | /* TODO: Add these to the table above... */ |
222 | font_Text_(monospace_FontId)->japaneseFont = smallJapanese_FontId; | 223 | font_Text_(default_FontId)->japaneseFont = defaultJapanese_FontId; |
223 | font_Text_(monospaceSmall_FontId)->japaneseFont = smallJapanese_FontId; | 224 | font_Text_(defaultMedium_FontId)->japaneseFont = defaultJapanese_FontId; |
224 | font_Text_(medium_FontId)->japaneseFont = mediumJapanese_FontId; | 225 | font_Text_(defaultMonospace_FontId)->japaneseFont = defaultJapanese_FontId; |
225 | font_Text_(big_FontId)->japaneseFont = bigJapanese_FontId; | 226 | font_Text_(monospace_FontId)->japaneseFont = smallJapanese_FontId; |
226 | font_Text_(bigBold_FontId)->japaneseFont = bigJapanese_FontId; | 227 | font_Text_(monospaceSmall_FontId)->japaneseFont = smallJapanese_FontId; |
227 | font_Text_(largeBold_FontId)->japaneseFont = largeJapanese_FontId; | 228 | font_Text_(medium_FontId)->japaneseFont = mediumJapanese_FontId; |
228 | font_Text_(largeLight_FontId)->japaneseFont = largeJapanese_FontId; | 229 | font_Text_(big_FontId)->japaneseFont = bigJapanese_FontId; |
229 | font_Text_(hugeBold_FontId)->japaneseFont = hugeJapanese_FontId; | 230 | font_Text_(bigBold_FontId)->japaneseFont = bigJapanese_FontId; |
231 | font_Text_(largeBold_FontId)->japaneseFont = largeJapanese_FontId; | ||
232 | font_Text_(largeLight_FontId)->japaneseFont = largeJapanese_FontId; | ||
233 | font_Text_(hugeBold_FontId)->japaneseFont = hugeJapanese_FontId; | ||
230 | } | 234 | } |
231 | gap_Text = iRound(gap_UI * d->contentFontSize); | 235 | gap_Text = iRound(gap_UI * d->contentFontSize); |
232 | } | 236 | } |