diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/FontManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/FontManager.java index 2627ff5be2..953964a306 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/FontManager.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/FontManager.java @@ -82,7 +82,28 @@ public final class FontManager { private static final ObjectProperty font = new SimpleObjectProperty<>(); + /// Bundled OFL fonts: Noto Sans SC for headings and controls, Noto Serif SC for body text. + private static final String[] BUNDLED_FONTS = { + "/assets/fonts/NotoSansSC-Regular.ttf", + "/assets/fonts/NotoSansSC-Bold.ttf", + "/assets/fonts/NotoSerifSC-Regular.ttf" + }; + + /// Registers the bundled fonts with JavaFX so style sheets can refer to them by family name. + private static void loadBundledFonts() { + for (String resource : BUNDLED_FONTS) { + try (var in = FontManager.class.getResourceAsStream(resource)) { + if (in == null || Font.loadFont(in, DEFAULT_FONT_SIZE) == null) { + LOG.warning("Failed to load bundled font " + resource); + } + } catch (java.io.IOException e) { + LOG.warning("Failed to load bundled font " + resource, e); + } + } + } + static { + loadBundledFonts(); updateFont(); LOG.info("Font: " + (font.get() != null ? font.get().family() : "System")); } diff --git a/HMCL/src/main/resources/assets/css/font.css b/HMCL/src/main/resources/assets/css/font.css index 7ee8fbf036..3d6e1ebe4d 100644 --- a/HMCL/src/main/resources/assets/css/font.css +++ b/HMCL/src/main/resources/assets/css/font.css @@ -2,7 +2,14 @@ * SPDX-FileCopyrightText: Copyright (C) 2025 The HMCL Authors * SPDX-License-Identifier: GPL-3.0-or-later WITH AdditionRef-HMCL */ +/* Body text uses the serif face; headings and controls use the sans face. Both are SIL OFL fonts. */ .root { - /* https://github.com/HMCL-dev/HMCL/pull/3423 */ - -fx-font-family: -fx-base-font-family; -} \ No newline at end of file + -fx-font-family: "Noto Serif SC"; +} + +.button, .jfx-button, .toggle-button, .jfx-toggle-button, .tab-label, +.jfx-layout-heading, .jfx-decorator-title, .method-title, .advanced-list-item .title, +.two-line-list-item .title, .announcement .title, .bold, .html-h3, .html-bold, .class-title, +.navigation-drawer-item, .jfx-tool-bar .label { + -fx-font-family: "Noto Sans SC"; +} diff --git a/HMCL/src/main/resources/assets/fonts/NotoSansSC-Bold.ttf b/HMCL/src/main/resources/assets/fonts/NotoSansSC-Bold.ttf new file mode 100644 index 0000000000..062c426079 Binary files /dev/null and b/HMCL/src/main/resources/assets/fonts/NotoSansSC-Bold.ttf differ diff --git a/HMCL/src/main/resources/assets/fonts/NotoSansSC-Regular.ttf b/HMCL/src/main/resources/assets/fonts/NotoSansSC-Regular.ttf new file mode 100644 index 0000000000..032c13e5b7 Binary files /dev/null and b/HMCL/src/main/resources/assets/fonts/NotoSansSC-Regular.ttf differ diff --git a/HMCL/src/main/resources/assets/fonts/NotoSerifSC-Regular.ttf b/HMCL/src/main/resources/assets/fonts/NotoSerifSC-Regular.ttf new file mode 100644 index 0000000000..db25466f4c Binary files /dev/null and b/HMCL/src/main/resources/assets/fonts/NotoSerifSC-Regular.ttf differ diff --git a/HMCL/src/main/resources/assets/fonts/OFL.txt b/HMCL/src/main/resources/assets/fonts/OFL.txt new file mode 100644 index 0000000000..1c9f43281b --- /dev/null +++ b/HMCL/src/main/resources/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source' + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE.