diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:22:29 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:22:29 +0300 |
| commit | f99a9111170f2ff28383fd3172fdaf4b9a1ba069 (patch) | |
| tree | a4c5b801298a569c5043ba69a1b9a6c010a9234c /src/ui/text.h | |
| parent | e84b1a4a13ee1932c609e9d9d64b0915fbf468b9 (diff) | |
| parent | d06c19e7fdd07ffc52ca4d4903fecf5b539f85ea (diff) | |
Merge branch 'dev' into work/v1.6
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'src/ui/text.h')
| -rw-r--r-- | src/ui/text.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/text.h b/src/ui/text.h index dd377247..5a099142 100644 --- a/src/ui/text.h +++ b/src/ui/text.h | |||
| @@ -117,7 +117,8 @@ iLocalDef iBool isJapanese_FontId(enum iFontId id) { | |||
| 117 | #define emojiVariationSelector_Char ((iChar) 0xfe0f) | 117 | #define emojiVariationSelector_Char ((iChar) 0xfe0f) |
| 118 | 118 | ||
| 119 | enum iTextFont { | 119 | enum iTextFont { |
| 120 | nunito_TextFont, | 120 | undefined_TextFont = -1, |
| 121 | nunito_TextFont = 0, | ||
| 121 | firaSans_TextFont, | 122 | firaSans_TextFont, |
| 122 | literata_TextFont, | 123 | literata_TextFont, |
| 123 | tinos_TextFont, | 124 | tinos_TextFont, |