Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds TabWidthMeasurer #360

Merged
merged 3 commits into from
Mar 16, 2024
Merged

Adds TabWidthMeasurer #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59c8e1d
Adds TabWidthMeasurer
simonbs Mar 16, 2024
a172985
Fixes typo
simonbs Mar 16, 2024
bc7455f
Merge branch 'main' into enhancement/tab-width-measurer
simonbs Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Sources/Runestone/Library/TabWidthMeasurer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import UIKit

enum TabWidthMeasurer {
static func tabWidth(tabLength: Int, font: UIFont) -> CGFloat {
let str = String(repeating: " ", count: tabLength)
let maxSize = CGSize(width: CGFloat.greatestFiniteMagnitude, height: .greatestFiniteMagnitude)
let options: NSStringDrawingOptions = [.usesFontLeading, .usesLineFragmentOrigin]
let attributes: [NSAttributedString.Key: Any] = [.font: font]
let bounds = str.boundingRect(with: maxSize, options: options, attributes: attributes, context: nil)
return round(bounds.size.width)
}
}
7 changes: 1 addition & 6 deletions Sources/Runestone/TextView/Indent/IndentController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@ final class IndentController {
if let tabWidth = _tabWidth {
return tabWidth
} else {
let str = String(repeating: " ", count: indentStrategy.tabLength)
let maxSize = CGSize(width: CGFloat.greatestFiniteMagnitude, height: .greatestFiniteMagnitude)
let options: NSStringDrawingOptions = [.usesFontLeading, .usesLineFragmentOrigin]
let attributes: [NSAttributedString.Key: Any] = [.font: indentFont]
let bounds = str.boundingRect(with: maxSize, options: options, attributes: attributes, context: nil)
let tabWidth = round(bounds.size.width)
let tabWidth = TabWidthMeasurer.tabWidth(tabLength: indentStrategy.tabLength, font: indentFont)
if tabWidth != _tabWidth {
_tabWidth = tabWidth
delegate?.indentControllerDidUpdateTabWidth(self)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Runestone/TextView/Indent/IndentStrategy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation

/// Strategy to use when indenting text.
public enum IndentStrategy: Equatable {
/// Indent using tabs. The length specified length is used to determine the width of the tab measured in space characers.
/// Indent using tabs. The specified length is used to determine the width of the tab measured in space characers.
case tab(length: Int)
/// Indent using a number of spaces.
case space(length: Int)
Expand Down
Loading