summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/text.c19
-rw-r--r--src/ui/text.h1
2 files changed, 11 insertions, 9 deletions
diff --git a/src/ui/text.c b/src/ui/text.c
index de8f10a4..0d7559cb 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -381,16 +381,16 @@ static void initFonts_Text_(iText *d) {
381 /* Content sizes: smallmono, mono, 1.0, 1.2, 1.333, 1.666, 2.0 */ 381 /* Content sizes: smallmono, mono, 1.0, 1.2, 1.333, 1.666, 2.0 */
382 } fontData[max_FontId] = { 382 } fontData[max_FontId] = {
383 /* UI fonts: normal weight */ 383 /* UI fonts: normal weight */
384 { &fontSourceSans3Regular_Embedded, uiSize, 1.0f, uiNormal_FontSize }, 384 { &fontSourceSans3Regular_Embedded, uiSize, 1.0f, uiNormal_FontSize },
385 { &fontSourceSans3Regular_Embedded, uiSize * 1.125f, 1.0f, uiMedium_FontSize }, 385 { &fontSourceSans3Regular_Embedded, uiSize * 1.125f, 1.0f, uiMedium_FontSize },
386 { &fontSourceSans3Regular_Embedded, uiSize * 1.333f, 1.0f, uiBig_FontSize }, 386 { &fontSourceSans3Regular_Embedded, uiSize * 1.333f, 1.0f, uiBig_FontSize },
387 { &fontSourceSans3Regular_Embedded, uiSize * 1.666f, 1.0f, uiLarge_FontSize }, 387 { &fontSourceSans3Regular_Embedded, uiSize * 1.666f, 1.0f, uiLarge_FontSize },
388 { &fontSourceSans3Semibold_Embedded, uiSize * 0.8f, 1.0f, uiNormal_FontSize }, 388 { &fontSourceSans3Semibold_Embedded, uiSize * 0.800f, 1.0f, uiSmall_FontSize },
389 /* UI fonts: bold weight */ 389 /* UI fonts: bold weight */
390 { &fontSourceSans3Bold_Embedded, uiSize, 1.0f, uiNormal_FontSize }, 390 { &fontSourceSans3Bold_Embedded, uiSize, 1.0f, uiNormal_FontSize },
391 { &fontSourceSans3Bold_Embedded, uiSize * 1.125f, 1.0f, uiMedium_FontSize }, 391 { &fontSourceSans3Bold_Embedded, uiSize * 1.125f, 1.0f, uiMedium_FontSize },
392 { &fontSourceSans3Bold_Embedded, uiSize * 1.333f, 1.0f, uiBig_FontSize }, 392 { &fontSourceSans3Bold_Embedded, uiSize * 1.333f, 1.0f, uiBig_FontSize },
393 { &fontSourceSans3Bold_Embedded, uiSize * 1.666f, 1.0f, uiLarge_FontSize }, 393 { &fontSourceSans3Bold_Embedded, uiSize * 1.666f, 1.0f, uiLarge_FontSize },
394 /* content fonts */ 394 /* content fonts */
395 { regularFont, textSize, scaling, contentRegular_FontSize }, 395 { regularFont, textSize, scaling, contentRegular_FontSize },
396 { boldFont, textSize, scaling, contentRegular_FontSize }, 396 { boldFont, textSize, scaling, contentRegular_FontSize },
@@ -411,6 +411,7 @@ static void initFonts_Text_(iText *d) {
411 { (data), uiSize * 1.125f, glyphScale, uiMedium_FontSize }, \ 411 { (data), uiSize * 1.125f, glyphScale, uiMedium_FontSize }, \
412 { (data), uiSize * 1.333f, glyphScale, uiBig_FontSize }, \ 412 { (data), uiSize * 1.333f, glyphScale, uiBig_FontSize }, \
413 { (data), uiSize * 1.666f, glyphScale, uiLarge_FontSize }, \ 413 { (data), uiSize * 1.666f, glyphScale, uiLarge_FontSize }, \
414 { (data), uiSize * 0.800f, glyphScale, uiSmall_FontSize }, \
414 { (data), textSize, glyphScale, contentRegular_FontSize }, \ 415 { (data), textSize, glyphScale, contentRegular_FontSize }, \
415 { (data), textSize * 1.200f, glyphScale, contentMedium_FontSize }, \ 416 { (data), textSize * 1.200f, glyphScale, contentMedium_FontSize }, \
416 { (data), textSize * 1.333f, glyphScale, contentBig_FontSize }, \ 417 { (data), textSize * 1.333f, glyphScale, contentBig_FontSize }, \
diff --git a/src/ui/text.h b/src/ui/text.h
index 1da43818..21ed4c8e 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -35,6 +35,7 @@ enum iFontSize {
35 uiMedium_FontSize, /* 1.125 */ 35 uiMedium_FontSize, /* 1.125 */
36 uiBig_FontSize, /* 1.333 */ 36 uiBig_FontSize, /* 1.333 */
37 uiLarge_FontSize, /* 1.666 */ 37 uiLarge_FontSize, /* 1.666 */
38 uiSmall_FontSize, /* 0.800 */
38 contentRegular_FontSize, 39 contentRegular_FontSize,
39 contentMedium_FontSize, 40 contentMedium_FontSize,
40 contentBig_FontSize, 41 contentBig_FontSize,