diff options
-rw-r--r-- | src/ui/text.c | 5 | ||||
-rw-r--r-- | src/ui/text.h | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ui/text.c b/src/ui/text.c index 4b3a5a10..2ceadb75 100644 --- a/src/ui/text.c +++ b/src/ui/text.c | |||
@@ -209,6 +209,7 @@ static void initFonts_Text_(iText *d) { | |||
209 | } fontData[max_FontId] = { | 209 | } fontData[max_FontId] = { |
210 | { &fontSourceSansProRegular_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, | 210 | { &fontSourceSansProRegular_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, |
211 | { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId }, | 211 | { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId }, |
212 | { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.666f, 1.0f, defaultLargeSymbols_FontId }, | ||
212 | { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.866f, 1.0f, defaultSymbols_FontId }, | 213 | { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.866f, 1.0f, defaultSymbols_FontId }, |
213 | /* content fonts */ | 214 | /* content fonts */ |
214 | { regularFont, textSize, scaling, symbols_FontId }, | 215 | { regularFont, textSize, scaling, symbols_FontId }, |
@@ -223,6 +224,7 @@ static void initFonts_Text_(iText *d) { | |||
223 | /* symbol fonts */ | 224 | /* symbol fonts */ |
224 | { &fontSymbola_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, | 225 | { &fontSymbola_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, |
225 | { &fontSymbola_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId }, | 226 | { &fontSymbola_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId }, |
227 | { &fontSymbola_Embedded, fontSize_UI * 1.666f, 1.0f, defaultLargeSymbols_FontId }, | ||
226 | { &fontSymbola_Embedded, textSize, 1.0f, symbols_FontId }, | 228 | { &fontSymbola_Embedded, textSize, 1.0f, symbols_FontId }, |
227 | { &fontSymbola_Embedded, textSize * 1.200f, 1.0f, mediumSymbols_FontId }, | 229 | { &fontSymbola_Embedded, textSize * 1.200f, 1.0f, mediumSymbols_FontId }, |
228 | { &fontSymbola_Embedded, textSize * 1.333f, 1.0f, bigSymbols_FontId }, | 230 | { &fontSymbola_Embedded, textSize * 1.333f, 1.0f, bigSymbols_FontId }, |
@@ -233,6 +235,7 @@ static void initFonts_Text_(iText *d) { | |||
233 | /* emoji fonts */ | 235 | /* emoji fonts */ |
234 | { &fontNotoEmojiRegular_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, | 236 | { &fontNotoEmojiRegular_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, |
235 | { &fontNotoEmojiRegular_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId }, | 237 | { &fontNotoEmojiRegular_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId }, |
238 | { &fontNotoEmojiRegular_Embedded, fontSize_UI * 1.666f, 1.0f, defaultLargeSymbols_FontId }, | ||
236 | { &fontNotoEmojiRegular_Embedded, textSize, 1.0f, symbols_FontId }, | 239 | { &fontNotoEmojiRegular_Embedded, textSize, 1.0f, symbols_FontId }, |
237 | { &fontNotoEmojiRegular_Embedded, textSize * 1.200f, 1.0f, mediumSymbols_FontId }, | 240 | { &fontNotoEmojiRegular_Embedded, textSize * 1.200f, 1.0f, mediumSymbols_FontId }, |
238 | { &fontNotoEmojiRegular_Embedded, textSize * 1.333f, 1.0f, bigSymbols_FontId }, | 241 | { &fontNotoEmojiRegular_Embedded, textSize * 1.333f, 1.0f, bigSymbols_FontId }, |
@@ -275,6 +278,7 @@ static void initFonts_Text_(iText *d) { | |||
275 | the other sizes. */ | 278 | the other sizes. */ |
276 | font_Text_(default_FontId)->japaneseFont = defaultJapanese_FontId; | 279 | font_Text_(default_FontId)->japaneseFont = defaultJapanese_FontId; |
277 | font_Text_(defaultMedium_FontId)->japaneseFont = defaultJapanese_FontId; | 280 | font_Text_(defaultMedium_FontId)->japaneseFont = defaultJapanese_FontId; |
281 | font_Text_(defaultLarge_FontId)->japaneseFont = defaultJapanese_FontId; | ||
278 | font_Text_(defaultMonospace_FontId)->japaneseFont = defaultJapanese_FontId; | 282 | font_Text_(defaultMonospace_FontId)->japaneseFont = defaultJapanese_FontId; |
279 | font_Text_(monospaceSmall_FontId)->japaneseFont = monospaceSmallJapanese_FontId; | 283 | font_Text_(monospaceSmall_FontId)->japaneseFont = monospaceSmallJapanese_FontId; |
280 | font_Text_(monospace_FontId)->japaneseFont = monospaceJapanese_FontId; | 284 | font_Text_(monospace_FontId)->japaneseFont = monospaceJapanese_FontId; |
@@ -287,6 +291,7 @@ static void initFonts_Text_(iText *d) { | |||
287 | /* Korean script. */ { | 291 | /* Korean script. */ { |
288 | font_Text_(default_FontId)->koreanFont = defaultKorean_FontId; | 292 | font_Text_(default_FontId)->koreanFont = defaultKorean_FontId; |
289 | font_Text_(defaultMedium_FontId)->koreanFont = defaultKorean_FontId; | 293 | font_Text_(defaultMedium_FontId)->koreanFont = defaultKorean_FontId; |
294 | font_Text_(defaultLarge_FontId)->koreanFont = defaultKorean_FontId; | ||
290 | font_Text_(defaultMonospace_FontId)->koreanFont = defaultKorean_FontId; | 295 | font_Text_(defaultMonospace_FontId)->koreanFont = defaultKorean_FontId; |
291 | font_Text_(monospaceSmall_FontId)->koreanFont = monospaceSmallKorean_FontId; | 296 | font_Text_(monospaceSmall_FontId)->koreanFont = monospaceSmallKorean_FontId; |
292 | font_Text_(monospace_FontId)->koreanFont = monospaceKorean_FontId; | 297 | font_Text_(monospace_FontId)->koreanFont = monospaceKorean_FontId; |
diff --git a/src/ui/text.h b/src/ui/text.h index 35f48528..3dd949d9 100644 --- a/src/ui/text.h +++ b/src/ui/text.h | |||
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ | |||
32 | enum iFontId { | 32 | enum iFontId { |
33 | default_FontId, | 33 | default_FontId, |
34 | defaultMedium_FontId, | 34 | defaultMedium_FontId, |
35 | defaultLarge_FontId, | ||
35 | defaultMonospace_FontId, | 36 | defaultMonospace_FontId, |
36 | /* content fonts */ | 37 | /* content fonts */ |
37 | regular_FontId, | 38 | regular_FontId, |
@@ -46,6 +47,7 @@ enum iFontId { | |||
46 | /* symbol fonts */ | 47 | /* symbol fonts */ |
47 | defaultSymbols_FontId, | 48 | defaultSymbols_FontId, |
48 | defaultMediumSymbols_FontId, | 49 | defaultMediumSymbols_FontId, |
50 | defaultLargeSymbols_FontId, | ||
49 | symbols_FontId, | 51 | symbols_FontId, |
50 | mediumSymbols_FontId, | 52 | mediumSymbols_FontId, |
51 | bigSymbols_FontId, | 53 | bigSymbols_FontId, |
@@ -56,6 +58,7 @@ enum iFontId { | |||
56 | /* emoji fonts */ | 58 | /* emoji fonts */ |
57 | defaultEmoji_FontId, | 59 | defaultEmoji_FontId, |
58 | defaultMediumEmoji_FontId, | 60 | defaultMediumEmoji_FontId, |
61 | defaultLargeEmoji_FontId, | ||
59 | emoji_FontId, | 62 | emoji_FontId, |
60 | mediumEmoji_FontId, | 63 | mediumEmoji_FontId, |
61 | bigEmoji_FontId, | 64 | bigEmoji_FontId, |
@@ -84,10 +87,11 @@ enum iFontId { | |||
84 | max_FontId, | 87 | max_FontId, |
85 | 88 | ||
86 | /* Meta: */ | 89 | /* Meta: */ |
87 | fromSymbolsToEmojiOffset_FontId = 9, | 90 | fromSymbolsToEmojiOffset_FontId = 10, |
88 | 91 | ||
89 | /* UI fonts: */ | 92 | /* UI fonts: */ |
90 | uiLabel_FontId = default_FontId, | 93 | uiLabel_FontId = default_FontId, |
94 | uiLabelLarge_FontId = defaultLarge_FontId, | ||
91 | uiShortcuts_FontId = default_FontId, | 95 | uiShortcuts_FontId = default_FontId, |
92 | uiInput_FontId = defaultMonospace_FontId, | 96 | uiInput_FontId = defaultMonospace_FontId, |
93 | uiContent_FontId = defaultMedium_FontId, | 97 | uiContent_FontId = defaultMedium_FontId, |