summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-10-01 18:26:27 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-10-01 18:26:27 +0300
commit9adadcb4c47e0ab6344df8057115325673572267 (patch)
treeae39ffc3baa1635803cb481f864f06c924aa2a1f /src/ui
parent5c7417c547b84c30eee42fce57cb09e0552ac34f (diff)
Added a 90% sized UI font for URL bar indicators
The 80% size is used in the toolbar.
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/root.c2
-rw-r--r--src/ui/text.c6
-rw-r--r--src/ui/text.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/ui/root.c b/src/ui/root.c
index 253d0cfb..63cce62d 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -996,7 +996,7 @@ void updateMetrics_Root(iRoot *d) {
996 const iWidget *toolBar = findChild_Widget(d->widget, "toolbar"); 996 const iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
997 const iWidget *viewButton = findChild_Widget(d->widget, "toolbar.view"); 997 const iWidget *viewButton = findChild_Widget(d->widget, "toolbar.view");
998 const iWidget *idButton = findChild_Widget(toolBar, "toolbar.ident"); 998 const iWidget *idButton = findChild_Widget(toolBar, "toolbar.ident");
999 const int font = defaultSmall_FontId; 999 const int font = defaultTiny_FontId;
1000 setFont_LabelWidget(idName, font); 1000 setFont_LabelWidget(idName, font);
1001 setPos_Widget(as_Widget(idName), 1001 setPos_Widget(as_Widget(idName),
1002 windowToLocal_Widget(as_Widget(idName), 1002 windowToLocal_Widget(as_Widget(idName),
diff --git a/src/ui/text.c b/src/ui/text.c
index 0d7559cb..1eff70ba 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -385,7 +385,8 @@ static void initFonts_Text_(iText *d) {
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.800f, 1.0f, uiSmall_FontSize }, 388 { &fontSourceSans3Regular_Embedded, uiSize * 0.900f, 1.0f, uiTiny_FontSize },
389 { &fontSourceSans3Semibold_Embedded, uiSize * 0.800f, 1.0f, uiTiny_FontSize },
389 /* UI fonts: bold weight */ 390 /* UI fonts: bold weight */
390 { &fontSourceSans3Bold_Embedded, uiSize, 1.0f, uiNormal_FontSize }, 391 { &fontSourceSans3Bold_Embedded, uiSize, 1.0f, uiNormal_FontSize },
391 { &fontSourceSans3Bold_Embedded, uiSize * 1.125f, 1.0f, uiMedium_FontSize }, 392 { &fontSourceSans3Bold_Embedded, uiSize * 1.125f, 1.0f, uiMedium_FontSize },
@@ -411,7 +412,8 @@ static void initFonts_Text_(iText *d) {
411 { (data), uiSize * 1.125f, glyphScale, uiMedium_FontSize }, \ 412 { (data), uiSize * 1.125f, glyphScale, uiMedium_FontSize }, \
412 { (data), uiSize * 1.333f, glyphScale, uiBig_FontSize }, \ 413 { (data), uiSize * 1.333f, glyphScale, uiBig_FontSize }, \
413 { (data), uiSize * 1.666f, glyphScale, uiLarge_FontSize }, \ 414 { (data), uiSize * 1.666f, glyphScale, uiLarge_FontSize }, \
414 { (data), uiSize * 0.800f, glyphScale, uiSmall_FontSize }, \ 415 { (data), uiSize * 0.900f, glyphScale, uiSmall_FontSize }, \
416 { (data), uiSize * 0.800f, glyphScale, uiTiny_FontSize }, \
415 { (data), textSize, glyphScale, contentRegular_FontSize }, \ 417 { (data), textSize, glyphScale, contentRegular_FontSize }, \
416 { (data), textSize * 1.200f, glyphScale, contentMedium_FontSize }, \ 418 { (data), textSize * 1.200f, glyphScale, contentMedium_FontSize }, \
417 { (data), textSize * 1.333f, glyphScale, contentBig_FontSize }, \ 419 { (data), textSize * 1.333f, glyphScale, contentBig_FontSize }, \
diff --git a/src/ui/text.h b/src/ui/text.h
index 21ed4c8e..35ae48f8 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -35,7 +35,8 @@ 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 uiSmall_FontSize, /* 0.900 */
39 uiTiny_FontSize, /* 0.800 */
39 contentRegular_FontSize, 40 contentRegular_FontSize,
40 contentMedium_FontSize, 41 contentMedium_FontSize,
41 contentBig_FontSize, 42 contentBig_FontSize,
@@ -60,6 +61,7 @@ enum iFontId {
60 defaultBig_FontId, 61 defaultBig_FontId,
61 defaultLarge_FontId, 62 defaultLarge_FontId,
62 defaultSmall_FontId, 63 defaultSmall_FontId,
64 defaultTiny_FontId,
63 /* UI fonts: bold weight */ 65 /* UI fonts: bold weight */
64 defaultBold_FontId, 66 defaultBold_FontId,
65 defaultMediumBold_FontId, 67 defaultMediumBold_FontId,