1
This commit is contained in:
1 parent
1ab5d52449
commit
5efc778165
18 files changed
+1031
-63
No files matched your search
@@ -84,6 +84,8 @@
|
||||
"terminalFont": "Terminal Font",
|
||||
"selectTerminalFont": "Select Terminal Font",
|
||||
"terminalFontPreview": "$ git status -s # terminal font preview",
|
||||
"terminalFontSize": "Terminal Font Size",
|
||||
"terminalFontSizeDialogTitle": "Terminal Font Size",
|
||||
"fontName": "{font, select, system_default{System Default} sans_serif{Sans-Serif} serif{Serif (Songti)} monospace{System Monospace} consolas{Consolas} courier_new{Courier New} menlo{Menlo / Monaco} jetbrains_mono{JetBrains Mono} fira_code{Fira Code} other{{font}}}",
|
||||
"@fontName": {
|
||||
"placeholders": {
|
||||
|
||||
@@ -602,6 +602,18 @@ abstract class AppLocalizations {
|
||||
/// **'\$ git status -s # 终端字体预览'**
|
||||
String get terminalFontPreview;
|
||||
|
||||
/// No description provided for @terminalFontSize.
|
||||
///
|
||||
/// In zh, this message translates to:
|
||||
/// **'终端字号'**
|
||||
String get terminalFontSize;
|
||||
|
||||
/// No description provided for @terminalFontSizeDialogTitle.
|
||||
///
|
||||
/// In zh, this message translates to:
|
||||
/// **'终端字号'**
|
||||
String get terminalFontSizeDialogTitle;
|
||||
|
||||
/// No description provided for @fontName.
|
||||
///
|
||||
/// In zh, this message translates to:
|
||||
|
||||
@@ -280,6 +280,12 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get terminalFontPreview => '\$ git status -s # terminal font preview';
|
||||
|
||||
@override
|
||||
String get terminalFontSize => 'Terminal Font Size';
|
||||
|
||||
@override
|
||||
String get terminalFontSizeDialogTitle => 'Terminal Font Size';
|
||||
|
||||
@override
|
||||
String fontName(String font) {
|
||||
String _temp0 = intl.Intl.selectLogic(font, {
|
||||
|
||||
@@ -276,6 +276,12 @@ class AppLocalizationsZh extends AppLocalizations {
|
||||
@override
|
||||
String get terminalFontPreview => '\$ git status -s # 终端字体预览';
|
||||
|
||||
@override
|
||||
String get terminalFontSize => '终端字号';
|
||||
|
||||
@override
|
||||
String get terminalFontSizeDialogTitle => '终端字号';
|
||||
|
||||
@override
|
||||
String fontName(String font) {
|
||||
String _temp0 = intl.Intl.selectLogic(font, {
|
||||
|
||||
@@ -84,6 +84,8 @@
|
||||
"terminalFont": "终端字体",
|
||||
"selectTerminalFont": "选择终端字体",
|
||||
"terminalFontPreview": "$ git status -s # 终端字体预览",
|
||||
"terminalFontSize": "终端字号",
|
||||
"terminalFontSizeDialogTitle": "终端字号",
|
||||
"fontName": "{font, select, system_default{系统默认} sans_serif{无衬线体} serif{衬线体(宋体)} monospace{系统等宽} consolas{Consolas} courier_new{Courier New} menlo{Menlo / Monaco} jetbrains_mono{JetBrains Mono} fira_code{Fira Code} other{{font}}}",
|
||||
"@fontName": {
|
||||
"placeholders": {
|
||||
|
||||
@@ -26,6 +26,7 @@ class SettingsProvider extends ChangeNotifier {
|
||||
|
||||
//终端
|
||||
static const String _keyTerminalFont = 'terminal_font_family'; //终端字体
|
||||
static const String _keyTerminalFontSize = 'terminal_font_size'; //终端字号
|
||||
static const String _keyTerminalBackgroundColor = 'terminal_background_color'; //终端背景颜色
|
||||
static const String _keyEnableTerminalVirtualKeyboard = 'enable_terminal_virtual_keyboard'; //终端小键盘启用
|
||||
static const String _keyTerminalKeyboardConfig = 'terminal_virtual_keyboard_config'; //终端小键盘配置JSON
|
||||
@@ -46,6 +47,7 @@ class SettingsProvider extends ChangeNotifier {
|
||||
String _editorFontId = 'jetbrains_mono';
|
||||
String _terminalFontId = 'jetbrains_mono';
|
||||
Color _terminalBackgroundColor = const Color(0xFF1E1E1E);
|
||||
double _terminalFontSize = 13.0;
|
||||
double _fontSize = 14.0;
|
||||
int _indentSize = 4;
|
||||
bool _wordWrap = false;
|
||||
@@ -77,6 +79,7 @@ class SettingsProvider extends ChangeNotifier {
|
||||
String get terminalFontId => _terminalFontId;
|
||||
AppFontItem get terminalFont => AppFonts.getTerminalFont(_terminalFontId);
|
||||
Color get terminalBackgroundColor => _terminalBackgroundColor;
|
||||
double get terminalFontSize => _terminalFontSize;
|
||||
|
||||
double get fontSize => _fontSize;
|
||||
int get indentSize => _indentSize;
|
||||
@@ -277,6 +280,11 @@ class SettingsProvider extends ChangeNotifier {
|
||||
_terminalBackgroundColor = Color(savedTerminalBackground);
|
||||
}
|
||||
|
||||
final savedTerminalFontSize = prefs.getDouble(_keyTerminalFontSize);
|
||||
if (savedTerminalFontSize != null) {
|
||||
_terminalFontSize = savedTerminalFontSize.clamp(8.0, 32.0);
|
||||
}
|
||||
|
||||
//设置项目配置
|
||||
final savedShowHiddenFiles = prefs.getBool(_keyShowHiddenFiles);
|
||||
if (savedShowHiddenFiles != null) {
|
||||
@@ -451,6 +459,18 @@ class SettingsProvider extends ChangeNotifier {
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
/// 设置终端字体大小
|
||||
Future<void> setTerminalFontSize(double size) async {
|
||||
final clamped = size.clamp(8.0, 32.0);
|
||||
if (_terminalFontSize == clamped) return;
|
||||
_terminalFontSize = clamped;
|
||||
notifyListeners();
|
||||
try {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.setDouble(_keyTerminalFontSize, clamped);
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
/// 设置是否显示隐藏文件
|
||||
Future<void> setShowHiddenFiles(bool show) async {
|
||||
if (_showHiddenFiles == show) return;
|
||||
|
||||
@@ -69,6 +69,7 @@ class SettingsView extends StatelessWidget {
|
||||
_buildTerminalVirtualKeyboardTile(context, provider, l10n),
|
||||
_buildTerminalVirtualKeyboardConfigTile(context, provider, l10n),
|
||||
_buildTerminalFontTile(context, provider),
|
||||
_buildTerminalFontSizeTile(context, provider, l10n),
|
||||
|
||||
const Divider(height: 32, indent: 16, endIndent: 16),
|
||||
|
||||
@@ -278,6 +279,121 @@ class SettingsView extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
/// 终端:终端字号条目
|
||||
Widget _buildTerminalFontSizeTile(
|
||||
BuildContext context,
|
||||
SettingsProvider provider,
|
||||
AppLocalizations l10n,
|
||||
) {
|
||||
final theme = Theme.of(context);
|
||||
|
||||
return ListTile(
|
||||
leading: Icon(Icons.format_size, color: theme.colorScheme.primary),
|
||||
title: Text(l10n.terminalFontSize),
|
||||
subtitle: Text('${provider.terminalFontSize.toInt()} pt'),
|
||||
trailing: SizedBox(
|
||||
width: 150,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
IconButton(
|
||||
icon: const Icon(Icons.remove, size: 18),
|
||||
visualDensity: VisualDensity.compact,
|
||||
tooltip: l10n.decreaseFontSize,
|
||||
onPressed: provider.terminalFontSize > 8.0
|
||||
? () => provider.setTerminalFontSize(provider.terminalFontSize - 1)
|
||||
: null,
|
||||
),
|
||||
Text(
|
||||
'${provider.terminalFontSize.toInt()}',
|
||||
style: const TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.add, size: 18),
|
||||
visualDensity: VisualDensity.compact,
|
||||
tooltip: l10n.increaseFontSize,
|
||||
onPressed: provider.terminalFontSize < 32.0
|
||||
? () => provider.setTerminalFontSize(provider.terminalFontSize + 1)
|
||||
: null,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
_showTerminalFontSizeDialog(context, provider, l10n);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
void _showTerminalFontSizeDialog(
|
||||
BuildContext context,
|
||||
SettingsProvider provider,
|
||||
AppLocalizations l10n,
|
||||
) {
|
||||
double tempSize = provider.terminalFontSize;
|
||||
final terminalFont = provider.terminalFont;
|
||||
|
||||
showDialog<void>(
|
||||
context: context,
|
||||
builder: (dialogContext) {
|
||||
return StatefulBuilder(
|
||||
builder: (context, setDialogState) {
|
||||
return AlertDialog(
|
||||
title: Text(l10n.terminalFontSizeDialogTitle),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
'${tempSize.toInt()} pt',
|
||||
style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Slider(
|
||||
value: tempSize.clamp(8.0, 32.0),
|
||||
min: 8.0,
|
||||
max: 32.0,
|
||||
divisions: 24,
|
||||
label: '${tempSize.toInt()}',
|
||||
onChanged: (val) {
|
||||
setDialogState(() {
|
||||
tempSize = val;
|
||||
});
|
||||
provider.setTerminalFontSize(val);
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: provider.terminalBackgroundColor,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Text(
|
||||
l10n.terminalFontPreview,
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: tempSize,
|
||||
fontFamily: terminalFont.fontFamily ?? 'monospace',
|
||||
fontFamilyFallback: terminalFont.fallback,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
FilledButton(
|
||||
onPressed: () => Navigator.of(dialogContext).pop(),
|
||||
child: Text(l10n.done),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/// 外观:主题颜色条目(点击弹出调色板)
|
||||
Widget _buildThemeColorTile(
|
||||
BuildContext context,
|
||||
|
||||
+121
-15
@@ -215,6 +215,103 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
|
||||
TerminalInputHandler? _delegateInputHandler;
|
||||
void Function(String)? _delegateOnOutput;
|
||||
|
||||
// 双指捏合缩放终端字号状态
|
||||
final Map<int, Offset> _pointerPositions = {};
|
||||
double? _initialPinchDistance;
|
||||
double? _initialPinchFontSize;
|
||||
double? _activeZoomFontSize;
|
||||
bool _isPinching = false;
|
||||
Offset? _initialLocalFocal;
|
||||
double _initialScrollV = 0.0;
|
||||
|
||||
void _handlePointerDown(PointerDownEvent event, double currentFontSize) {
|
||||
_pointerPositions[event.pointer] = event.position;
|
||||
if (_pointerPositions.length == 2) {
|
||||
final points = _pointerPositions.values.toList();
|
||||
_initialPinchDistance = (points[0] - points[1]).distance;
|
||||
_initialPinchFontSize = _activeZoomFontSize ?? currentFontSize;
|
||||
|
||||
final globalFocal = (points[0] + points[1]) / 2;
|
||||
final renderBox = context.findRenderObject() as RenderBox?;
|
||||
_initialLocalFocal = renderBox != null ? renderBox.globalToLocal(globalFocal) : globalFocal;
|
||||
_initialScrollV = _terminalScrollController.hasClients ? _terminalScrollController.offset : 0.0;
|
||||
|
||||
// 双指缩放开始时,清除可能残留的选区,避免手柄或菜单错位
|
||||
_terminalController.clearSelection();
|
||||
|
||||
setState(() {
|
||||
_isPinching = true;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _handlePointerMove(PointerMoveEvent event) {
|
||||
if (!_pointerPositions.containsKey(event.pointer)) return;
|
||||
_pointerPositions[event.pointer] = event.position;
|
||||
|
||||
if (_pointerPositions.length >= 2 &&
|
||||
_initialPinchDistance != null &&
|
||||
_initialPinchDistance! > 10.0 &&
|
||||
_initialPinchFontSize != null &&
|
||||
_initialLocalFocal != null) {
|
||||
final points = _pointerPositions.values.toList();
|
||||
final currentDistance = (points[0] - points[1]).distance;
|
||||
final scale = currentDistance / _initialPinchDistance!;
|
||||
final rawFontSize = (_initialPinchFontSize! * scale).clamp(8.0, 32.0);
|
||||
final newFontSize = (rawFontSize * 10).round() / 10.0;
|
||||
final fontScale = newFontSize / _initialPinchFontSize!;
|
||||
|
||||
final currentGlobalFocal = (points[0] + points[1]) / 2;
|
||||
final renderBox = context.findRenderObject() as RenderBox?;
|
||||
final currentLocalFocal = renderBox != null
|
||||
? renderBox.globalToLocal(currentGlobalFocal)
|
||||
: currentGlobalFocal;
|
||||
|
||||
if (_terminalScrollController.hasClients && _terminalScrollController.position.maxScrollExtent > 0) {
|
||||
final targetScrollV = (_initialScrollV + _initialLocalFocal!.dy) * fontScale - currentLocalFocal.dy;
|
||||
_terminalScrollController.jumpTo(targetScrollV.clamp(0.0, _terminalScrollController.position.maxScrollExtent));
|
||||
}
|
||||
|
||||
if (_activeZoomFontSize != newFontSize) {
|
||||
setState(() {
|
||||
_activeZoomFontSize = newFontSize;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void _handlePointerUp(PointerUpEvent event) {
|
||||
_pointerPositions.remove(event.pointer);
|
||||
if (_pointerPositions.length < 2 && _isPinching) {
|
||||
_finishPinchZoom();
|
||||
}
|
||||
}
|
||||
|
||||
void _handlePointerCancel(PointerCancelEvent event) {
|
||||
_pointerPositions.remove(event.pointer);
|
||||
if (_pointerPositions.length < 2 && _isPinching) {
|
||||
_finishPinchZoom();
|
||||
}
|
||||
}
|
||||
|
||||
void _finishPinchZoom() {
|
||||
final finalSize = _activeZoomFontSize;
|
||||
if (finalSize != null) {
|
||||
try {
|
||||
final settings = context.read<SettingsProvider?>();
|
||||
settings?.setTerminalFontSize(finalSize.roundToDouble());
|
||||
} catch (_) {}
|
||||
}
|
||||
setState(() {
|
||||
_isPinching = false;
|
||||
_initialPinchDistance = null;
|
||||
_initialPinchFontSize = null;
|
||||
_activeZoomFontSize = null;
|
||||
_initialLocalFocal = null;
|
||||
_initialScrollV = 0.0;
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@@ -255,9 +352,11 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
|
||||
final session = widget.session;
|
||||
final settings = context.watch<SettingsProvider?>();
|
||||
final terminalFont = settings?.terminalFont ?? AppFonts.terminalMonospace;
|
||||
final currentBaseFontSize = settings?.terminalFontSize ?? 13.0;
|
||||
final displayFontSize = _activeZoomFontSize ?? currentBaseFontSize;
|
||||
|
||||
final terminalStyle = xterm.TerminalStyle(
|
||||
fontSize: 13.0,
|
||||
fontSize: displayFontSize,
|
||||
fontFamily: terminalFont.fontFamily ?? 'monospace',
|
||||
fontFamilyFallback: terminalFont.fallback,
|
||||
);
|
||||
@@ -276,23 +375,30 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
|
||||
child: Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: TerminalSelectionOverlay(
|
||||
terminal: session.terminal,
|
||||
controller: _terminalController,
|
||||
terminalViewKey: _terminalViewKey,
|
||||
scrollController: _terminalScrollController,
|
||||
focusNode: session.focusNode,
|
||||
child: xterm.TerminalView(
|
||||
session.terminal,
|
||||
key: _terminalViewKey,
|
||||
child: Listener(
|
||||
behavior: HitTestBehavior.translucent,
|
||||
onPointerDown: (e) => _handlePointerDown(e, currentBaseFontSize),
|
||||
onPointerMove: _handlePointerMove,
|
||||
onPointerUp: _handlePointerUp,
|
||||
onPointerCancel: _handlePointerCancel,
|
||||
child: TerminalSelectionOverlay(
|
||||
terminal: session.terminal,
|
||||
controller: _terminalController,
|
||||
terminalViewKey: _terminalViewKey,
|
||||
scrollController: _terminalScrollController,
|
||||
focusNode: session.focusNode,
|
||||
autofocus: true,
|
||||
theme: terminalThemeWithBackground(backgroundColor),
|
||||
textStyle: terminalStyle,
|
||||
cursorType: xterm.TerminalCursorType.block,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 8.0),
|
||||
child: xterm.TerminalView(
|
||||
session.terminal,
|
||||
key: _terminalViewKey,
|
||||
controller: _terminalController,
|
||||
scrollController: _terminalScrollController,
|
||||
focusNode: session.focusNode,
|
||||
autofocus: true,
|
||||
theme: terminalThemeWithBackground(backgroundColor),
|
||||
textStyle: terminalStyle,
|
||||
cursorType: xterm.TerminalCursorType.block,
|
||||
padding: const EdgeInsets.fromLTRB(10.0, 8.0, 10.0, 20.0),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -52,39 +52,50 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
||||
int? _currentIndentSize;
|
||||
bool _isShowingConflictDialog = false;
|
||||
|
||||
// 双指捏合缩放字号及中心锚定状态
|
||||
// 双指捏合实时缩放字号及中心锚定状态
|
||||
final GlobalKey _editorContainerKey = GlobalKey();
|
||||
final Map<int, Offset> _pointerPositions = {};
|
||||
int? _pinchPointer1;
|
||||
int? _pinchPointer2;
|
||||
double? _initialPinchDistance;
|
||||
double? _initialPinchFontSize;
|
||||
double? _activeZoomFontSize;
|
||||
bool _isPinching = false;
|
||||
CodeLineSelection? _pinchSelection;
|
||||
Offset? _initialLocalFocal;
|
||||
Offset? _currentLocalFocal;
|
||||
double _initialScrollV = 0.0;
|
||||
double _initialScrollH = 0.0;
|
||||
|
||||
void _handlePointerDown(PointerDownEvent event, double currentFontSize) {
|
||||
_pointerPositions[event.pointer] = event.position;
|
||||
if (_pointerPositions.length == 2) {
|
||||
final points = _pointerPositions.values.toList();
|
||||
_initialPinchDistance = (points[0] - points[1]).distance;
|
||||
_initialPinchFontSize = _activeZoomFontSize ?? currentFontSize;
|
||||
if (_pointerPositions.length >= 2 && !_isPinching) {
|
||||
final keys = _pointerPositions.keys.toList();
|
||||
_pinchPointer1 = keys[0];
|
||||
_pinchPointer2 = keys[1];
|
||||
|
||||
// 停止当前的惯性滚动,保证锚定基准平稳
|
||||
final p1 = _pointerPositions[_pinchPointer1]!;
|
||||
final p2 = _pointerPositions[_pinchPointer2]!;
|
||||
|
||||
_initialPinchDistance = (p1 - p2).distance;
|
||||
_initialPinchFontSize = _activeZoomFontSize ?? currentFontSize;
|
||||
_activeZoomFontSize = _initialPinchFontSize;
|
||||
|
||||
// 锁定底层滚动控制器并停止惯性滚动,彻底阻断单指拖拽识别器与内部 viewport 修正干扰
|
||||
final vScroller = _scrollController?.verticalScroller;
|
||||
if (vScroller is CodeEditorScrollController) {
|
||||
vScroller.stopScrolling();
|
||||
vScroller.isPinchLocked = true;
|
||||
}
|
||||
final hScroller = _scrollController?.horizontalScroller;
|
||||
if (hScroller is CodeEditorScrollController) {
|
||||
hScroller.stopScrolling();
|
||||
hScroller.isPinchLocked = true;
|
||||
}
|
||||
|
||||
final globalFocal = (points[0] + points[1]) / 2;
|
||||
final globalFocal = (p1 + p2) / 2;
|
||||
final renderBox = _editorContainerKey.currentContext?.findRenderObject() as RenderBox?;
|
||||
final localFocal = renderBox != null ? renderBox.globalToLocal(globalFocal) : globalFocal;
|
||||
_initialLocalFocal = localFocal;
|
||||
_currentLocalFocal = localFocal;
|
||||
|
||||
_initialScrollV = (_scrollController?.verticalScroller.hasClients == true)
|
||||
? _scrollController!.verticalScroller.offset
|
||||
@@ -110,32 +121,53 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
||||
if (!_pointerPositions.containsKey(event.pointer)) return;
|
||||
_pointerPositions[event.pointer] = event.position;
|
||||
|
||||
if (_pointerPositions.length >= 2 &&
|
||||
if (_isPinching &&
|
||||
_pinchPointer1 != null &&
|
||||
_pinchPointer2 != null &&
|
||||
_pointerPositions.containsKey(_pinchPointer1) &&
|
||||
_pointerPositions.containsKey(_pinchPointer2) &&
|
||||
_initialPinchDistance != null &&
|
||||
_initialPinchDistance! > 10.0 &&
|
||||
_initialPinchFontSize != null &&
|
||||
_initialLocalFocal != null) {
|
||||
final points = _pointerPositions.values.toList();
|
||||
final currentDistance = (points[0] - points[1]).distance;
|
||||
final scale = currentDistance / _initialPinchDistance!;
|
||||
final rawFontSize = (_initialPinchFontSize! * scale).clamp(10.0, 30.0);
|
||||
final newFontSize = (rawFontSize * 10).round() / 10.0;
|
||||
final fontScale = newFontSize / _initialPinchFontSize!;
|
||||
final p1 = _pointerPositions[_pinchPointer1]!;
|
||||
final p2 = _pointerPositions[_pinchPointer2]!;
|
||||
|
||||
final currentGlobalFocal = (points[0] + points[1]) / 2;
|
||||
final currentDistance = (p1 - p2).distance;
|
||||
final rawScale = currentDistance / _initialPinchDistance!;
|
||||
|
||||
// 边界弹性阻尼(10.0 ~ 30.0)
|
||||
final minScale = 10.0 / _initialPinchFontSize!;
|
||||
final maxScale = 30.0 / _initialPinchFontSize!;
|
||||
final clampedScale = rawScale.clamp(minScale * 0.9, maxScale * 1.1);
|
||||
|
||||
final currentGlobalFocal = (p1 + p2) / 2;
|
||||
final renderBox = _editorContainerKey.currentContext?.findRenderObject() as RenderBox?;
|
||||
final currentLocalFocal = renderBox != null
|
||||
? renderBox.globalToLocal(currentGlobalFocal)
|
||||
: currentGlobalFocal;
|
||||
_currentLocalFocal = currentLocalFocal;
|
||||
|
||||
final targetScrollV = (_initialScrollV + _initialLocalFocal!.dy) * fontScale - currentLocalFocal.dy;
|
||||
final targetScrollH = (_initialScrollH + _initialLocalFocal!.dx) * fontScale - currentLocalFocal.dx;
|
||||
// 连续高精度浮点字号(避免 0.1 离散跳变造成的阶梯式顿挫)
|
||||
final continuousFontSize = ((_initialPinchFontSize! * clampedScale) * 100).round() / 100.0;
|
||||
final newFontSize = continuousFontSize.clamp(10.0, 30.0);
|
||||
final fontRatio = newFontSize / _initialPinchFontSize!;
|
||||
|
||||
// 焦心连续锚定公式:保持手指焦心下的代码行与手指相对位置绝对静止
|
||||
final targetScrollV = (_initialScrollV + _initialLocalFocal!.dy) * fontRatio - currentLocalFocal.dy;
|
||||
final targetScrollH = (_initialScrollH + _initialLocalFocal!.dx) * fontRatio - currentLocalFocal.dx;
|
||||
|
||||
if (_scrollController?.verticalScroller.hasClients == true) {
|
||||
_scrollController!.verticalScroller.jumpTo(max(0.0, targetScrollV));
|
||||
final pos = _scrollController!.verticalScroller.position;
|
||||
final maxV = max(0.0, pos.maxScrollExtent);
|
||||
final clampedV = targetScrollV.clamp(0.0, maxV);
|
||||
_scrollController!.verticalScroller.jumpTo(clampedV);
|
||||
}
|
||||
if (_scrollController?.horizontalScroller.hasClients == true) {
|
||||
_scrollController!.horizontalScroller.jumpTo(max(0.0, targetScrollH));
|
||||
final pos = _scrollController!.horizontalScroller.position;
|
||||
final maxH = max(0.0, pos.maxScrollExtent);
|
||||
final clampedH = targetScrollH.clamp(0.0, maxH);
|
||||
_scrollController!.horizontalScroller.jumpTo(clampedH);
|
||||
}
|
||||
|
||||
if (_activeZoomFontSize != newFontSize) {
|
||||
@@ -148,16 +180,33 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
||||
|
||||
void _handlePointerUp(PointerUpEvent event) {
|
||||
_pointerPositions.remove(event.pointer);
|
||||
if (_pointerPositions.length < 2 && _isPinching) {
|
||||
if (_isPinching && (event.pointer == _pinchPointer1 || event.pointer == _pinchPointer2 || _pointerPositions.length < 2)) {
|
||||
_finishPinchZoom();
|
||||
}
|
||||
if (_pointerPositions.isEmpty) {
|
||||
_unlockPinch();
|
||||
}
|
||||
}
|
||||
|
||||
void _handlePointerCancel(PointerCancelEvent event) {
|
||||
_pointerPositions.remove(event.pointer);
|
||||
if (_pointerPositions.length < 2 && _isPinching) {
|
||||
if (_isPinching && (event.pointer == _pinchPointer1 || event.pointer == _pinchPointer2 || _pointerPositions.length < 2)) {
|
||||
_finishPinchZoom();
|
||||
}
|
||||
if (_pointerPositions.isEmpty) {
|
||||
_unlockPinch();
|
||||
}
|
||||
}
|
||||
|
||||
void _unlockPinch() {
|
||||
final vScroller = _scrollController?.verticalScroller;
|
||||
if (vScroller is CodeEditorScrollController) {
|
||||
vScroller.isPinchLocked = false;
|
||||
}
|
||||
final hScroller = _scrollController?.horizontalScroller;
|
||||
if (hScroller is CodeEditorScrollController) {
|
||||
hScroller.isPinchLocked = false;
|
||||
}
|
||||
}
|
||||
|
||||
void _finishPinchZoom() {
|
||||
@@ -165,19 +214,48 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
||||
final savedSelection = _pinchSelection;
|
||||
_pinchSelection = null;
|
||||
|
||||
if (finalSize != null) {
|
||||
final initialFontSize = _initialPinchFontSize;
|
||||
final initialLocalFocal = _initialLocalFocal;
|
||||
final currentLocalFocal = _currentLocalFocal ?? initialLocalFocal;
|
||||
final initialScrollV = _initialScrollV;
|
||||
final initialScrollH = _initialScrollH;
|
||||
|
||||
if (finalSize != null && initialFontSize != null && initialLocalFocal != null && currentLocalFocal != null) {
|
||||
// 手势释放后定格为整数(如 16.0),持久化到用户设置
|
||||
final double targetFontSize = finalSize.clamp(10.0, 30.0).roundToDouble();
|
||||
final double fontRatio = targetFontSize / initialFontSize;
|
||||
|
||||
final targetScrollV = (initialScrollV + initialLocalFocal.dy) * fontRatio - currentLocalFocal.dy;
|
||||
final targetScrollH = (initialScrollH + initialLocalFocal.dx) * fontRatio - currentLocalFocal.dx;
|
||||
|
||||
try {
|
||||
final settings = _getSettingsProvider(context);
|
||||
settings.setFontSize(finalSize.roundToDouble());
|
||||
settings.setFontSize(targetFontSize);
|
||||
} catch (_) {}
|
||||
|
||||
if (_scrollController?.verticalScroller.hasClients == true) {
|
||||
final pos = _scrollController!.verticalScroller.position;
|
||||
final maxV = max(0.0, pos.maxScrollExtent);
|
||||
final clampedV = targetScrollV.clamp(0.0, maxV);
|
||||
_scrollController!.verticalScroller.jumpTo(clampedV);
|
||||
}
|
||||
if (_scrollController?.horizontalScroller.hasClients == true) {
|
||||
final pos = _scrollController!.horizontalScroller.position;
|
||||
final maxH = max(0.0, pos.maxScrollExtent);
|
||||
final clampedH = targetScrollH.clamp(0.0, maxH);
|
||||
_scrollController!.horizontalScroller.jumpTo(clampedH);
|
||||
}
|
||||
}
|
||||
|
||||
setState(() {
|
||||
_isPinching = false;
|
||||
_pinchPointer1 = null;
|
||||
_pinchPointer2 = null;
|
||||
_initialPinchDistance = null;
|
||||
_initialPinchFontSize = null;
|
||||
_activeZoomFontSize = null;
|
||||
_initialLocalFocal = null;
|
||||
_currentLocalFocal = null;
|
||||
_initialScrollV = 0.0;
|
||||
_initialScrollH = 0.0;
|
||||
});
|
||||
@@ -529,11 +607,13 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
||||
onPointerCancel: _handlePointerCancel,
|
||||
child: Stack(
|
||||
children: [
|
||||
CodeEditor(
|
||||
key: ValueKey(_currentLoadedPath),
|
||||
controller: controller,
|
||||
focusNode: _focusNode,
|
||||
scrollController: _scrollController,
|
||||
IgnorePointer(
|
||||
ignoring: _isPinching,
|
||||
child: CodeEditor(
|
||||
key: ValueKey(_currentLoadedPath),
|
||||
controller: controller,
|
||||
focusNode: _focusNode,
|
||||
scrollController: _scrollController,
|
||||
wordWrap: activeWordWrap,
|
||||
pinLineNumbers: pinLineNumbers,
|
||||
toolbarController: _toolbarController,
|
||||
@@ -594,6 +674,43 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
||||
}
|
||||
: null,
|
||||
),
|
||||
),
|
||||
// 双指缩放实时字号悬浮胶囊提示
|
||||
if (_isPinching && _activeZoomFontSize != null)
|
||||
Positioned(
|
||||
top: 16,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: Center(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 6),
|
||||
decoration: BoxDecoration(
|
||||
color: activeTheme.backgroundColor.computeLuminance() > 0.5
|
||||
? Colors.black.withValues(alpha: 0.75)
|
||||
: Colors.white.withValues(alpha: 0.85),
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withValues(alpha: 0.2),
|
||||
blurRadius: 8,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Text(
|
||||
'${_activeZoomFontSize!.round()} px',
|
||||
style: TextStyle(
|
||||
color: activeTheme.backgroundColor.computeLuminance() > 0.5
|
||||
? Colors.white
|
||||
: Colors.black87,
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: 0.3,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -298,7 +298,10 @@ class _TerminalSelectionOverlayState extends State<TerminalSelectionOverlay> {
|
||||
onCopy: _handleCopy,
|
||||
onPaste: _handlePaste,
|
||||
onSelectAll: _handleSelectAll,
|
||||
onDismiss: _hideMenu,
|
||||
onDismiss: () {
|
||||
_hideMenu();
|
||||
widget.controller.clearSelection();
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user