Skip to content

PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.

fix(ui): use consistent fonts on Windows

baiyuzee7e642310b24
diff --git a/ui/lib/main.dart b/ui/lib/main.dart
index f1abfd8..005f930 100644
--- a/ui/lib/main.dart
+++ b/ui/lib/main.dart
@@ -28,8 +28,9 @@ class CopySyncApp extends StatefulWidget {
class _CopySyncAppState extends State<CopySyncApp> {
late final AppState _state;
- final _light = buildTheme(Brightness.light);
- final _dark = buildTheme(Brightness.dark);
+
+ /// 按界面语言缓存的浅色、深色主题:Windows 上中文和日文的汉字用不同的字体
+ final _themes = <String, (ThemeData, ThemeData)>{};
@override
void initState() {
@@ -52,21 +53,32 @@ class _CopySyncAppState extends State<CopySyncApp> {
// 语言设置存在后台服务的配置里,配置变了要重建 MaterialApp 才会换语言
child: ListenableBuilder(
listenable: _state,
- builder: (context, _) => MaterialApp(
- title: 'CopySync',
- debugShowCheckedModeBanner: false,
- theme: _light,
- darkTheme: _dark,
- locale: localeFromSetting(_state.config?.language ?? ''),
- supportedLocales: supportedLocales,
- localizationsDelegates: AppLocalizations.localizationsDelegates,
- localeListResolutionCallback: (preferred, _) => resolveLocale(preferred),
- builder: (context, child) {
- appL10n = context.l10n;
- return child!;
- },
- home: const Shell(),
- ),
+ builder: (context, _) {
+ final locale = localeFromSetting(_state.config?.language ?? '');
+ final language =
+ (locale ?? resolveLocale(WidgetsBinding.instance.platformDispatcher.locales)).languageCode;
+ final (light, dark) = _themes.putIfAbsent(
+ language,
+ () => (
+ buildTheme(Brightness.light, language: language),
+ buildTheme(Brightness.dark, language: language),
+ ));
+ return MaterialApp(
+ title: 'CopySync',
+ debugShowCheckedModeBanner: false,
+ theme: light,
+ darkTheme: dark,
+ locale: locale,
+ supportedLocales: supportedLocales,
+ localizationsDelegates: AppLocalizations.localizationsDelegates,
+ localeListResolutionCallback: (preferred, _) => resolveLocale(preferred),
+ builder: (context, child) {
+ appL10n = context.l10n;
+ return child!;
+ },
+ home: const Shell(),
+ );
+ },
),
);
}
diff --git a/ui/lib/pages/devices_page.dart b/ui/lib/pages/devices_page.dart
index 0566097..dfd7f13 100644
--- a/ui/lib/pages/devices_page.dart
+++ b/ui/lib/pages/devices_page.dart
@@ -203,7 +203,7 @@ class _DeviceMenu extends StatelessWidget {
TextField(
controller: controller,
autofocus: true,
- style: const TextStyle(fontFamily: monoFamily, fontSize: 14),
+ style: TextStyle(fontFamily: monoFamily, fontSize: 14),
decoration: const InputDecoration(hintText: '192.168.1.20'),
onSubmitted: (v) => Navigator.pop(ctx, v),
),
diff --git a/ui/lib/theme.dart b/ui/lib/theme.dart
index f893a2b..e0f71a2 100644
--- a/ui/lib/theme.dart
+++ b/ui/lib/theme.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
import 'package:flutter/material.dart';
/// CopySync 的设计系统。
@@ -136,10 +138,26 @@ extension PaletteAccess on BuildContext {
}
/// 等宽字体:配对码、指纹、服务器地址这类需要逐字符核对的内容。
-const monoFamily = 'Menlo';
+/// Windows 没有 Menlo,找不到时会退回 Segoe UI,数字就不等宽了。
+final monoFamily = Platform.isWindows ? 'Consolas' : 'Menlo';
+
+/// Windows 上汉字用哪些字体,按界面语言 [language] 排先后。
+///
+/// Flutter 在 Windows 上默认只认 Segoe UI,汉字交给系统逐字回退:中日共用的字常落到
+/// 日文字体,简体独有的字落到雅黑或宋体,同一行里字形参差不齐。把回退顺序定死,
+/// 汉字就统一用同一套字体,和系统自带的应用一致。
+List<String> windowsFontFallback(String language) => language == 'ja'
+ ? const ['Yu Gothic UI', 'Meiryo UI', 'Microsoft YaHei UI']
+ : const ['Microsoft YaHei UI', 'Microsoft YaHei', 'Yu Gothic UI'];
-/// [fontFamily] 只给截图渲染用:App 本身不指定,跟随系统字体(SF Pro 与苹方)。
-ThemeData buildTheme(Brightness brightness, {String? fontFamily, List<String>? fontFamilyFallback}) {
+/// [fontFamily] 只给截图渲染用:App 本身不指定。Mac 上跟随系统字体(SF Pro 与苹方),
+/// Windows 上用 Segoe UI,汉字按 [language] 用 [windowsFontFallback] 里的字体。
+ThemeData buildTheme(Brightness brightness,
+ {String? fontFamily, List<String>? fontFamilyFallback, String language = 'zh'}) {
+ if (fontFamily == null && Platform.isWindows) {
+ fontFamily = 'Segoe UI';
+ fontFamilyFallback = windowsFontFallback(language);
+ }
final dark = brightness == Brightness.dark;
final p = dark ? AppPalette.dark : AppPalette.light;
diff --git a/ui/lib/widgets/pairing_dialog.dart b/ui/lib/widgets/pairing_dialog.dart
index 992a135..ccccf09 100644
--- a/ui/lib/widgets/pairing_dialog.dart
+++ b/ui/lib/widgets/pairing_dialog.dart
@@ -324,7 +324,7 @@ class _JoinTabState extends State<_JoinTab> {
maxLength: 6,
textCapitalization: TextCapitalization.characters,
textAlign: TextAlign.center,
- style: const TextStyle(
+ style: TextStyle(
fontSize: 28,
fontWeight: FontWeight.w600,
fontFamily: monoFamily,
@@ -350,7 +350,7 @@ class _JoinTabState extends State<_JoinTab> {
TextField(
controller: _addressController,
textAlign: TextAlign.center,
- style: const TextStyle(fontFamily: monoFamily, fontSize: 14),
+ style: TextStyle(fontFamily: monoFamily, fontSize: 14),
decoration: InputDecoration(
labelText: l.peerAddress,
hintText: '192.168.1.20',