diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-04-14 23:17:36 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-04-15 22:27:56 +0300 |
| commit | 6ee601c642b3a4fa182334eb1ca015d71d6eaedd (patch) | |
| tree | 08f58a6dd7f430a21b63d87be5b73ed7fbae5508 /indra/newview | |
| parent | 45f8e60cb4ec113e0bf07f28f84405e25ba356fd (diff) | |
#2023 Load from a variable font
WIP, beacsue variable fonts are not yeat included.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/fonts.xml | 22 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/ja/fonts.xml | 62 |
2 files changed, 30 insertions, 54 deletions
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 81f5d8afe2..efa4706485 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -4,7 +4,7 @@ <font name="default" comment="default font files (global fallbacks)"> - <file load_collection="true" font_hinting="default">Inter_18pt-Regular.ttf</file> + <file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans.ttf</file> <file functor="is_emoji">TwemojiSVG.ttf</file> <os name="Windows"> @@ -37,7 +37,7 @@ <font name="SansSerifBold" comment="Name of bold sans-serif font"> - <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-ExtraBold.ttf</file> + <file load_collection="true" flags="bold" font_weight="600">Inter-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans-Bold.ttf</file> <os name="Windows"> <file>arialbd.ttf</file> @@ -50,7 +50,7 @@ <font name="SansSerif" comment="Name of san-serif font (Truetype file name)"> - <file load_collection="true" font_hinting="default">Inter_18pt-Regular.ttf</file> + <file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans.ttf</file> <os name="Windows"> <file>arial.ttf</file> @@ -64,7 +64,7 @@ name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD"> - <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-Bold.ttf</file> + <file load_collection="true" flags="bold" font_weight="600">Inter-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans-Bold.ttf</file> </font> @@ -72,7 +72,7 @@ name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC"> - <file load_collection="true">Inter_18pt-Italic.ttf</file> + <file load_collection="true" font_weight="400">Inter-Italic-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans-Oblique.ttf</file> </font> @@ -80,7 +80,7 @@ name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC"> - <file load_collection="true">Inter_18pt-BoldItalic.ttf</file> + <file load_collection="true" font_weight="800">Inter-Italic-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans-BoldOblique.ttf</file> </font> @@ -121,7 +121,7 @@ <font name="Helvetica" comment="Name of Helvetica font"> - <file font_hinting="default">Inter_18pt-Regular.ttf</file> + <file font_weight="400">Inter-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans.ttf</file> <os name="Windows"> <file>arial.ttf</file> @@ -135,7 +135,7 @@ name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD"> - <file font_hinting="default" flags="bold">Inter_18pt-ExtraBold.ttf</file> + <file flags="bold" font_weight="800">Inter-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans-Bold.ttf</file> <os name="Windows"> <file>arialbd.ttf</file> @@ -149,7 +149,7 @@ name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC"> - <file>Inter_18pt-Italic.ttf</file> + <file font_weight="400">Inter-Italic-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans-Oblique.ttf</file> <os name="Windows"> <file>ariali.ttf</file> @@ -163,7 +163,7 @@ name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC"> - <file>Inter_18pt-BoldItalic.ttf</file> + <file font_weight="800">Inter-Italic-VariableFont_opsz,wght.ttf</file> <file size_delta="-0.5">DejaVuSans-BoldOblique.ttf</file> <os name="Windows"> <file>arialbi.ttf</file> @@ -177,7 +177,7 @@ name="OverrideTest" comment="Name of font to test overriding"> <file>times.ttf</file> - <file font_hinting="default">Inter_18pt-Regular.ttf</file> + <file font_weight="400">Inter-VariableFont_opsz,wght.ttf</file> </font> <font_size name="Monospace" diff --git a/indra/newview/skins/default/xui/ja/fonts.xml b/indra/newview/skins/default/xui/ja/fonts.xml index 874f530f17..73abf542d4 100644 --- a/indra/newview/skins/default/xui/ja/fonts.xml +++ b/indra/newview/skins/default/xui/ja/fonts.xml @@ -4,9 +4,7 @@ <file> NotoSansCJKjp-SemiBold.otf </file> - <file load_collection="true" font_hinting="default"> - Inter_18pt-Regular.ttf - </file> + <file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file> <os name="Windows"> <file load_collection="true"> YuGothM.ttc @@ -82,9 +80,7 @@ <file> NotoSansCJKjp-Bold.otf </file> - <file load_collection="true" font_hinting="default" flags="bold"> - Inter_18pt-SemiBold.ttf - </file> + <file load_collection="true" font_weight="800" flags="bold">Inter-VariableFont_opsz,wght.ttf</file> <os name="Windows"> <file load_collection="true"> YuGothB.ttc @@ -104,11 +100,9 @@ </font> <font name="SansSerif" comment="Name of san-serif font (Truetype file name)"> <file> - NotoSansCJKjp-Bold.otf + NotoSansCJKjp-SemiBold.otf </file> - <file load_collection="true" font_hinting="default"> - Inter_18pt-Regular.ttf - </file> + <file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file> <os name="Windows"> <file> arial.ttf @@ -121,19 +115,13 @@ </os> </font> <font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD"> - <file load_collection="true" font_hinting="default" flags="bold"> - Inter_18pt-SemiBold.ttf - </file> + <file load_collection="true" font_weight="800" flags="bold">Inter-VariableFont_opsz,wght.ttf</file> </font> <font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC"> - <file load_collection="true"> - Inter_18pt-Italic.ttf - </file> + <file load_collection="true" font_weight="400">Inter-Italic-VariableFont_opsz,wght.ttf</file> </font> <font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC"> - <file load_collection="true" font_hinting="default" flags="bold"> - Inter_18pt-SemiBoldItalic.ttf - </file> + <file load_collection="true" flags="bold" font_weight="800">Inter-Italic-VariableFont_opsz,wght.ttf</file> </font> <font name="Monospace" comment="Name of monospace font"> <file> @@ -144,29 +132,25 @@ </file> </font> <font name="DejaVu" comment="Name of DejaVu font"> - <file load_collection="true" font_hinting="default"> - Inter_18pt-Regular.ttf - </file> + <file>DejaVuSans.ttf</file> </font> <font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD"> - <file load_collection="true" font_hinting="force_auto" flags="bold"> - Inter_18pt-SemiBold.ttf + <file> + DejaVuSans-Bold.ttf </file> </font> <font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC"> - <file load_collection="true"> - Inter_18pt-Italic.ttf + <file> + DejaVuSans-Oblique.ttf </file> </font> <font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC"> - <file load_collection="true" font_hinting="default" flags="bold"> - Inter_18pt-SemiBoldItalic.ttf + <file> + DejaVuSans-BoldOblique.ttf </file> </font> <font name="Helvetica" comment="Name of Helvetica font"> - <file load_collection="true" font_hinting="default"> - Inter_18pt-Regular.ttf - </file> + <file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file> <os name="Windows"> <file> arial.ttf @@ -179,9 +163,7 @@ </os> </font> <font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD"> - <file load_collection="true" font_hinting="default" flags="bold"> - Inter_18pt-SemiBold.ttf - </file> + <file load_collection="true" font_weight="800" flags="bold">Inter-VariableFont_opsz,wght.ttf</file> <os name="Windows"> <file> arialbd.ttf @@ -194,9 +176,7 @@ </os> </font> <font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC"> - <file load_collection="true"> - Inter_18pt-Italic.ttf - </file> + <file load_collection="true" font_weight="400">Inter-Italic-VariableFont_opsz,wght.ttf</file> <os name="Windows"> <file> ariali.ttf @@ -209,9 +189,7 @@ </os> </font> <font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC"> - <file load_collection="true" font_hinting="default" flags="bold"> - Inter_18pt-SemiBoldItalic.ttf - </file> + <file load_collection="true" flags="bold" font_weight="800">Inter-Italic-VariableFont_opsz,wght.ttf</file> <os name="Windows"> <file> arialbi.ttf @@ -227,9 +205,7 @@ <file> times.ttf </file> - <file load_collection="true" font_hinting="default"> - Inter_18pt-Regular.ttf - </file> + <file font_weight="400">Inter-VariableFont_opsz,wght.ttf</file> </font> <font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" size="8.0"/> <font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" size="16.0"/> |
