coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-20 23:58:08 +03:00
Code Issues Projects Releases Wiki Activity

Refactor OutlineItem

Browse Source
This commit is contained in:
1024jp 2024-02-13 18:41:34 +09:00
parent 4c15e96d8f
commit 0b258b7f35
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CotEditor/Sources/OutlineInspectorView.swift
View File

@ -169,10 +169,10 @@ private struct OutlineRowView: View {
Divider()
}
} else {
Text(self.item.attributedTitle)
.bold(self.item.style.contains(.bold))
.italic(self.item.style.contains(.italic))
.underline(self.item.style.contains(.underline))
Text(self.item.attributedTitle(.init()
.backgroundColor(.findHighlightColor)
.foregroundColor(.black.withAlphaComponent(0.9)) // for legibility in Dark Mode
))
}
}
}
@ -257,7 +257,7 @@ private extension OutlineInspectorView.Model {
model.items = [
OutlineItem(title: "Hallo", range: .notFound),
OutlineItem(title: "Guten Tag!", range: .notFound, style: [.bold]),
OutlineItem(title: "-", range: .notFound),
OutlineItem(title: .separator, range: .notFound),
OutlineItem(title: "Hund", range: .notFound, style: [.underline]),
]

39
CotEditor/Sources/OutlineItem.swift
View File

@ -23,6 +23,7 @@
// limitations under the License.
//
import SwiftUI
import AppKit.NSFont
import struct Foundation.NSRange
@ -41,6 +42,7 @@ struct OutlineItem: Equatable, Identifiable {
static let underline = Self(rawValue: 1 << 2)
}
let id = UUID()
var title: String
@ -48,16 +50,18 @@ struct OutlineItem: Equatable, Identifiable {
var style: Style = []
fileprivate(set) var filteredRanges: [Range<String.Index>]?
var isSeparator: Bool {
self.title == .separator
}
var isSeparator: Bool { self.title == .separator }
}
extension OutlineItem {
/// Returns styled title for a view in AppKit.
///
/// - Parameters:
/// - baseFont: The base font of change.
/// - paragraphStyle: The paragraph style to apply.
/// - Returns: An AttributedString.
func attributedTitle(for baseFont: NSFont, paragraphStyle: NSParagraphStyle) -> AttributedString {
var attributes = AttributeContainer().paragraphStyle(paragraphStyle)
@ -81,20 +85,33 @@ extension OutlineItem {
}
var attributedTitle: AttributedString {
/// Returns styled title applying the filter match highlight for a view in SwiftUI.
///
/// - Parameter attributes: The attributes for the matched parts of filtering.
/// - Returns: An AttributedString.
func attributedTitle(_ attributes: AttributeContainer? = nil) -> AttributedString {
var attrTitle = AttributedString(self.title)
var font: Font = .body
guard let ranges = self.filteredRanges else { return attrTitle }
if self.style.contains(.bold) {
font = font.bold()
}
if self.style.contains(.italic) {
font = font.italic()
}
if self.style.contains(.underline) {
attrTitle.underlineStyle = .single
}
let attributes = AttributeContainer()
.backgroundColor(.findHighlightColor)
.foregroundColor(.black.withAlphaComponent(0.9)) // for legibility in Dark Mode
attrTitle.font = font
guard let ranges = self.filteredRanges, let attributes else { return attrTitle }
for range in ranges {
guard let attrRange = Range(range, in: attrTitle) else { continue }
attrTitle[attrRange].setAttributes(attributes)
attrTitle[attrRange].mergeAttributes(attributes)
}
return attrTitle