coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Tweak RegularExpressionReferenceView

Browse Source
This commit is contained in:
1024jp 2023-11-01 22:16:06 +09:00
parent dbbf5fd812
commit f37d21182a
2 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ Change Log
- [trivial] Dim the switcher buttons in the inspector when the window is inactive.
- [trivial] Improve the style of the pop-up buttons in the print panel.
- [trivial] Adjust the layout of the regular expression syntax reference.
### Fixes

52
CotEditor/Sources/RegularExpressionReferenceView.swift
View File

@ -78,45 +78,37 @@ struct RegularExpressionReferenceView: View {
var body: some View {
Section {
HStack(alignment: .top) {
VStack(alignment: .leading) {
VStack(alignment: .leading) {
Text("Basic Regular Expression Syntax")
.font(.title3)
.foregroundColor(.secondary)
HStack(alignment: .top, spacing: 12) {
VStack(alignment: .leading, spacing: 12) {
DefinitionList(Definition.characters, title: "Characters")
Spacer()
DefinitionList(Definition.anchors, title: "Anchors")
}
Divider()
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 12) {
DefinitionList(Definition.quantifiers, title: "Quantifiers")
Spacer()
DefinitionList(Definition.extendedGroups, title: "Extended Groups")
Spacer()
DefinitionList(Definition.backReference, title: "Back Reference")
}
}
.controlSize(.small)
}.controlSize(.small)
} header: {
Text("Basic Regular Expression Syntax")
.font(.title3)
.foregroundColor(.secondaryLabel)
.frame(maxWidth: .infinity, alignment: .leading)
} footer: {
let icuURL = "https://unicode-org.github.io/icu/userguide/strings/regexp.html"
let icuLink = AttributedString(localized: "ICU Regular Expressions")
.settingAttributes(.init([
.link: URL(string: "https://unicode-org.github.io/icu/userguide/strings/regexp.html")!,
]))
.settingAttributes(.init([.link: URL(string: icuURL)!]))
Text("The syntax conforms to the \(icuLink) specifications.",
comment: "%@ is the name of the regex engine (ICU Regular Expressions)")
.font(.footnote)
.foregroundColor(.secondary)
.tint(.accent)
.tint(.accentColor)
.frame(maxWidth: .infinity, alignment: .trailing)
.multilineTextAlignment(.leading)
.padding(.top, 8)
}
.fixedSize(horizontal: true, vertical: false)
.fixedSize()
.scenePadding()
}
@ -136,23 +128,21 @@ struct RegularExpressionReferenceView: View {
var body: some View {
Section {
VStack(alignment: .leading, spacing: 2) {
Text(self.title)
.fontWeight(.semibold)
.foregroundColor(.secondary)
Grid(alignment: .leading, verticalSpacing: 1) {
ForEach(self.definitions) { definition in
GridRow {
Text(verbatim: definition.term)
Text(definition.term)
.fontWeight(.medium)
Text(definition.description)
}
}
}
} header: {
Text(self.title)
.fontWeight(.semibold)
.foregroundColor(.secondaryLabel)
}
.frame(minWidth: 200, alignment: .leading)
}.frame(minWidth: 200, alignment: .leading)
}
}
}