This commit is contained in:
LZX committed 2026-09-15 23:37:47 +08:00
1 parent ce598b2d86
commit b5328277ab
17 files changed
+1656 -242

No files matched your search

+1 -1
View File
@@ -50,7 +50,7 @@ class SettingsProvider extends ChangeNotifier {
int _indentSize = 4;
bool _wordWrap = false;
bool _showLineNumbers = true;
bool _pinLineNumbers = true;
bool _pinLineNumbers = false;
bool _enableVirtualKeyboard = defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS;
String _virtualKeyboardConfigJson = VirtualKeyboardConfig.defaultJsonPretty();
VirtualKeyboardConfig _virtualKeyboardConfig = VirtualKeyboardConfig.defaultConfiguration();
+4
View File
@@ -208,6 +208,7 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
/// 终端控制器与 View GlobalKey(用于选区、手柄与上下文菜单定位)
late final xterm.TerminalController _terminalController = xterm.TerminalController();
final ScrollController _terminalScrollController = ScrollController();
final GlobalKey<xterm.TerminalViewState> _terminalViewKey = GlobalKey<xterm.TerminalViewState>();
/// 终端原有的输入处理器与输出出口(用于串联,而不是替换)
@@ -244,6 +245,7 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
}
terminal.onOutput = _delegateOnOutput;
_modifiers.dispose();
_terminalScrollController.dispose();
_terminalController.dispose();
super.dispose();
}
@@ -278,11 +280,13 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
terminal: session.terminal,
controller: _terminalController,
terminalViewKey: _terminalViewKey,
scrollController: _terminalScrollController,
focusNode: session.focusNode,
child: xterm.TerminalView(
session.terminal,
key: _terminalViewKey,
controller: _terminalController,
scrollController: _terminalScrollController,
focusNode: session.focusNode,
autofocus: true,
theme: terminalThemeWithBackground(backgroundColor),
+2 -10
View File
@@ -58,8 +58,6 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate {
// 1. 计算受保护的可视安全编辑区与屏幕顶界
// 屏幕顶界:手机系统状态栏安全区(由于菜单置于 rootOverlay 顶层悬浮层,高于 TabBar 和 AppBar,因此向上可借用其空间,避免向下翻转遮挡光标)
final double screenTop = mediaQuery.padding.top + 6.0;
// 编辑区顶界:排除 AppBar / TabBar (renderRect.top),用于编辑区居中或贴顶显示
final double editorTop = max(renderRect?.top ?? 0.0, mediaQuery.padding.top) + 6.0;
// 底部:排除软键盘 (viewInsets.bottom)、虚拟小键盘 (renderRect.bottom) 以及底部安全区
final double screenBottomWithoutKeyboard = mediaQuery.size.height - mediaQuery.viewInsets.bottom - mediaQuery.padding.bottom;
final double safeBottom = min(renderRect?.bottom ?? screenBottomWithoutKeyboard, screenBottomWithoutKeyboard) - 6.0;
@@ -68,7 +66,6 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate {
final double safeRight = min(renderRect?.right ?? mediaQuery.size.width, mediaQuery.size.width - mediaQuery.padding.right) - 8.0;
final double availableWidth = max(0.0, safeRight - safeLeft);
final double editorAvailableHeight = max(0.0, safeBottom - editorTop);
// 2. 根据 anchors 中的 EditorToolbarPlacement 或传统 anchors 计算位置
EditorToolbarPlacement placement = EditorToolbarPlacement.aboveStart;
@@ -90,15 +87,10 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate {
switch (placement) {
case EditorToolbarPlacement.center:
// 框选文本完全占据当前屏幕:在编辑区中间显示
x = safeLeft + (availableWidth - childSize.width) / 2.0;
y = editorTop + (editorAvailableHeight - childSize.height) / 2.0;
break;
case EditorToolbarPlacement.top:
// 选区整体在视口上方:在视口顶部贴边显示
// 用户明确要求:改在屏幕最上方显示,即使显示在 tab 或 appbar 上面也没关系,彻底避免在屏幕中间遮挡文本
x = safeLeft + (availableWidth - childSize.width) / 2.0;
y = editorTop + 4.0;
y = screenTop;
break;
case EditorToolbarPlacement.bottom:
+85 -11
View File
@@ -1,3 +1,4 @@
import 'dart:math';
import 'package:code_editor/l10n/app_localizations.dart';
import 'package:code_editor/models/app_font.dart';
import 'package:code_editor/models/editor_tab_item.dart';
@@ -51,12 +52,17 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
int? _currentIndentSize;
bool _isShowingConflictDialog = false;
// 双指捏合缩放字号状态
// 双指捏合缩放字号及中心锚定状态
final GlobalKey _editorContainerKey = GlobalKey();
final Map<int, Offset> _pointerPositions = {};
double? _initialPinchDistance;
double? _initialPinchFontSize;
double? _activeZoomFontSize;
bool _isPinching = false;
CodeLineSelection? _pinchSelection;
Offset? _initialLocalFocal;
double _initialScrollV = 0.0;
double _initialScrollH = 0.0;
void _handlePointerDown(PointerDownEvent event, double currentFontSize) {
_pointerPositions[event.pointer] = event.position;
@@ -64,6 +70,36 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
final points = _pointerPositions.values.toList();
_initialPinchDistance = (points[0] - points[1]).distance;
_initialPinchFontSize = _activeZoomFontSize ?? currentFontSize;
// 停止当前的惯性滚动,保证锚定基准平稳
final vScroller = _scrollController?.verticalScroller;
if (vScroller is CodeEditorScrollController) {
vScroller.stopScrolling();
}
final hScroller = _scrollController?.horizontalScroller;
if (hScroller is CodeEditorScrollController) {
hScroller.stopScrolling();
}
final globalFocal = (points[0] + points[1]) / 2;
final renderBox = _editorContainerKey.currentContext?.findRenderObject() as RenderBox?;
final localFocal = renderBox != null ? renderBox.globalToLocal(globalFocal) : globalFocal;
_initialLocalFocal = localFocal;
_initialScrollV = (_scrollController?.verticalScroller.hasClients == true)
? _scrollController!.verticalScroller.offset
: 0.0;
_initialScrollH = (_scrollController?.horizontalScroller.hasClients == true)
? _scrollController!.horizontalScroller.offset
: 0.0;
final currentController = _controller;
if (currentController != null &&
!currentController.selection.isCollapsed &&
currentController.selection.baseOffset != -1) {
_pinchSelection = currentController.selection;
}
_toolbarController.hide(context);
setState(() {
_isPinching = true;
});
@@ -77,12 +113,31 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
if (_pointerPositions.length >= 2 &&
_initialPinchDistance != null &&
_initialPinchDistance! > 10.0 &&
_initialPinchFontSize != null) {
_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 currentGlobalFocal = (points[0] + points[1]) / 2;
final renderBox = _editorContainerKey.currentContext?.findRenderObject() as RenderBox?;
final currentLocalFocal = renderBox != null
? renderBox.globalToLocal(currentGlobalFocal)
: currentGlobalFocal;
final targetScrollV = (_initialScrollV + _initialLocalFocal!.dy) * fontScale - currentLocalFocal.dy;
final targetScrollH = (_initialScrollH + _initialLocalFocal!.dx) * fontScale - currentLocalFocal.dx;
if (_scrollController?.verticalScroller.hasClients == true) {
_scrollController!.verticalScroller.jumpTo(max(0.0, targetScrollV));
}
if (_scrollController?.horizontalScroller.hasClients == true) {
_scrollController!.horizontalScroller.jumpTo(max(0.0, targetScrollH));
}
if (_activeZoomFontSize != newFontSize) {
setState(() {
_activeZoomFontSize = newFontSize;
@@ -107,12 +162,8 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
void _finishPinchZoom() {
final finalSize = _activeZoomFontSize;
setState(() {
_isPinching = false;
_initialPinchDistance = null;
_initialPinchFontSize = null;
_activeZoomFontSize = null;
});
final savedSelection = _pinchSelection;
_pinchSelection = null;
if (finalSize != null) {
try {
@@ -120,6 +171,27 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
settings.setFontSize(finalSize.roundToDouble());
} catch (_) {}
}
setState(() {
_isPinching = false;
_initialPinchDistance = null;
_initialPinchFontSize = null;
_activeZoomFontSize = null;
_initialLocalFocal = null;
_initialScrollV = 0.0;
_initialScrollH = 0.0;
});
if (savedSelection != null && !savedSelection.isCollapsed) {
final currentController = _controller;
if (currentController != null) {
currentController.selection = savedSelection;
}
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
_toolbarController.reshowLastToolbar(context);
});
}
}
EditorTabItem? _getCurrentTab() {
@@ -151,8 +223,8 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
void _restoreTabScrollState(EditorTabItem tab) {
final oldScroll = _scrollController;
final vScroller = ScrollController(initialScrollOffset: tab.verticalScrollOffset);
final hScroller = ScrollController(initialScrollOffset: tab.horizontalScrollOffset);
final vScroller = CodeEditorScrollController(initialScrollOffset: tab.verticalScrollOffset);
final hScroller = CodeEditorScrollController(initialScrollOffset: tab.horizontalScrollOffset);
vScroller.addListener(() {
if (vScroller.hasClients) {
@@ -449,6 +521,7 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
children: [
Expanded(
child: Listener(
key: _editorContainerKey,
behavior: HitTestBehavior.translucent,
onPointerDown: (event) => _handlePointerDown(event, activeFontSize),
onPointerMove: _handlePointerMove,
@@ -464,7 +537,8 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
wordWrap: activeWordWrap,
pinLineNumbers: pinLineNumbers,
toolbarController: _toolbarController,
margin: const EdgeInsets.only(left: 2.0, top: 4.0, right: 8, bottom: 8.0),
margin: EdgeInsets.zero,
extraHorizontalScroll: 160.0,
padding: const EdgeInsets.fromLTRB(6.0, 0.0, 0.0, 0.0),
leadingDivider: showLineNumbers
? Container(
File diff suppressed because it is too large. Load diff