nyne/venera
1
0
Fork 0
mirror of https://github.com/venera-app/venera.git synced 2025-09-28 08:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve editor

Browse Source
This commit is contained in:
nyne
2024-12-31 15:50:28 +08:00
parent 8eddab5e13
commit 1ca8da1c83
1 changed files with 74 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/components/code.dart
View File

@@ -55,8 +55,9 @@ class _CodeEditorState extends State<CodeEditor> {
Widget buildLineNumbers() {
return SizedBox(
width: 14 * 1.5,
child: Column(children: [
width: 32,
child: Column(
children: [
for (var i = 1; i <= lineCount; i++)
SizedBox(
height: 14 * 1.5,
@@ -65,15 +66,16 @@ class _CodeEditorState extends State<CodeEditor> {
i.toString(),
style: TextStyle(
color: context.colorScheme.outline,
fontSize: 14,
fontSize: 13,
height: 1.0,
fontFamily: 'consolas',
fontFamily: 'Consolas',
fontFamilyFallback: ['Courier New', 'monospace'],
),
).paddingBottom(6),
),
),
],),
),
],
),
).paddingVertical(8);
}
@@ -87,10 +89,18 @@ class _CodeEditorState extends State<CodeEditor> {
if (value.connectionState == ConnectionState.waiting) {
return const SizedBox();
}
return Scrollbar(
return GestureDetector(
onTap: () {
_controller.selection = TextSelection.collapsed(
offset: _controller.text.length,
);
_focusNode.requestFocus();
},
child: Scrollbar(
thumbVisibility: true,
controller: verticalScrollController,
notificationPredicate: (notif) => notif.metrics.axis == Axis.vertical,
notificationPredicate: (notif) =>
notif.metrics.axis == Axis.vertical,
child: Scrollbar(
thumbVisibility: true,
controller: horizontalScrollController,
@@ -102,21 +112,20 @@ class _CodeEditorState extends State<CodeEditor> {
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
controller: horizontalScrollController,
child: SingleChildScrollView(
scrollDirection: Axis.vertical,
controller: verticalScrollController,
child: Row(
children: [
buildLineNumbers(),
IntrinsicWidth(
stepWidth: 50,
stepWidth: 100,
child: TextField(
controller: _controller,
focusNode: _focusNode,
maxLines: null,
expands: true,
cursorHeight: 1.5 * 14,
style: TextStyle(
height: 1.5,
fontSize: 14
),
style: TextStyle(height: 1.5, fontSize: 14),
decoration: InputDecoration(
border: InputBorder.none,
contentPadding: EdgeInsets.all(8),
@@ -129,7 +138,6 @@ class _CodeEditorState extends State<CodeEditor> {
});
}
},
scrollController: verticalScrollController,
),
),
],
@@ -138,6 +146,8 @@ class _CodeEditorState extends State<CodeEditor> {
),
),
),
),
),
);
},
);
@@ -176,8 +186,8 @@ class _CodeTextEditingController extends TextEditingController {
style = TextStyle(
height: 1.5,
fontSize: 14,
fontFamily: 'consolas',
fontFamilyFallback: ['Courier New', 'monospace'],
fontFamily: 'Consolas',
fontFamilyFallback: ['Courier New', 'Roboto Mono', 'monospace'],
);
return mergeTextStyle(result, style);
@@ -186,7 +196,10 @@ class _CodeTextEditingController extends TextEditingController {
TextSpan mergeTextStyle(TextSpan span, TextStyle style) {
var result = TextSpan(
style: style.merge(span.style),
children: span.children?.whereType().map((e) => mergeTextStyle(e, style)).toList(),
children: span.children
?.whereType()
.map((e) => mergeTextStyle(e, style))
.toList(),
text: span.text,
);
return result;