Skip to content

Commit ebb86de

Browse files
Passed overscroll setting to CodeEditSourceEditor
1 parent d61866b commit ebb86de

File tree

3 files changed

+12
-27
lines changed

3 files changed

+12
-27
lines changed

CodeEdit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 6C81916A29B41DD300B75C92 /* DequeModule */; };
2929
6C85BB402C2105ED00EB5DEF /* CodeEditKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C85BB3F2C2105ED00EB5DEF /* CodeEditKit */; };
3030
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 6C85BB432C210EFD00EB5DEF /* SwiftUIIntrospect */; };
31-
6C9DB9E42D55656300ACD86E /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */; };
3231
6CAAF68A29BC9C2300A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
3332
6CAAF69229BCC71C00A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
3433
6CAAF69429BCD78600A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -185,7 +184,6 @@
185184
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */,
186185
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */,
187186
6CB94D032CA1205100E8651C /* AsyncAlgorithms in Frameworks */,
188-
6C9DB9E42D55656300ACD86E /* CodeEditSourceEditor in Frameworks */,
189187
);
190188
runOnlyForDeploymentPostprocessing = 0;
191189
};
@@ -319,7 +317,6 @@
319317
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
320318
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
321319
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
322-
6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */,
323320
);
324321
productName = CodeEdit;
325322
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -422,7 +419,7 @@
422419
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
423420
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
424421
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
425-
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
422+
30E4D51A2D9A2F3B00B94EB6 /* XCLocalSwiftPackageReference "../CodeEditSourceEditorOverscroll" */,
426423
);
427424
preferredProjectObjectVersion = 55;
428425
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -1619,6 +1616,13 @@
16191616
};
16201617
/* End XCConfigurationList section */
16211618

1619+
/* Begin XCLocalSwiftPackageReference section */
1620+
30E4D51A2D9A2F3B00B94EB6 /* XCLocalSwiftPackageReference "../CodeEditSourceEditorOverscroll" */ = {
1621+
isa = XCLocalSwiftPackageReference;
1622+
relativePath = ../CodeEditSourceEditorOverscroll;
1623+
};
1624+
/* End XCLocalSwiftPackageReference section */
1625+
16221626
/* Begin XCRemoteSwiftPackageReference section */
16231627
2816F592280CF50500DD548B /* XCRemoteSwiftPackageReference "CodeEditSymbols" */ = {
16241628
isa = XCRemoteSwiftPackageReference;
@@ -1740,14 +1744,6 @@
17401744
minimumVersion = 1.2.0;
17411745
};
17421746
};
1743-
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
1744-
isa = XCRemoteSwiftPackageReference;
1745-
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
1746-
requirement = {
1747-
kind = upToNextMajorVersion;
1748-
minimumVersion = 0.10.0;
1749-
};
1750-
};
17511747
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */ = {
17521748
isa = XCRemoteSwiftPackageReference;
17531749
repositoryURL = "https://github.com/apple/swift-async-algorithms.git";
@@ -1841,11 +1837,6 @@
18411837
package = 6C85BB422C210EFD00EB5DEF /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
18421838
productName = SwiftUIIntrospect;
18431839
};
1844-
6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */ = {
1845-
isa = XCSwiftPackageProductDependency;
1846-
package = 6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */;
1847-
productName = CodeEditSourceEditor;
1848-
};
18491840
6CB4463F2B6DFF3A00539ED0 /* CodeEditSourceEditor */ = {
18501841
isa = XCSwiftPackageProductDependency;
18511842
productName = CodeEditSourceEditor;

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 1 addition & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CodeEdit/Features/Editor/Views/CodeFileView.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ struct CodeFileView: View {
3030
var lineHeightMultiple
3131
@AppSettings(\.textEditing.wrapLinesToEditorWidth)
3232
var wrapLinesToEditorWidth
33+
@AppSettings(\.textEditing.overscroll)
34+
var overscroll
3335
@AppSettings(\.textEditing.font)
3436
var settingsFont
3537
@AppSettings(\.theme.useThemeBackground)
@@ -127,6 +129,7 @@ struct CodeFileView: View {
127129
indentOption: (codeFile.indentOption ?? indentOption).textViewOption(),
128130
lineHeight: lineHeightMultiple,
129131
wrapLines: codeFile.wrapLines ?? wrapLinesToEditorWidth,
132+
editorOverscroll: overscroll.overscrollPercentage,
130133
cursorPositions: $cursorPositions,
131134
useThemeBackground: useThemeBackground,
132135
contentInsets: edgeInsets.nsEdgeInsets,

0 commit comments

Comments
 (0)