Skip to content

Use a different method to estimate the size which take Font type into account #52

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use a different method to estimate the size which take Font type into account #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8cd0e9
Add .DS_Store to .ignore
maniramezan Apr 26, 2020
765ec32
Change the way ratioLabel size is calculated
maniramezan Apr 26, 2020
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ Pods/
# Add this line if you want to avoid checking in source code from Carthage dependencies.
Carthage/Checkouts
Carthage/Build

.DS_Store
7 changes: 6 additions & 1 deletion GCProgressSample/GradientCircularProgress/Progress/Core/ProgressAtRatioView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,13 @@ class ProgressAtRatioView: UIView {
ratioLabel.font = prop.ratioLabelFont
ratioLabel.textAlignment = NSTextAlignment.right
ratioLabel.textColor = prop.ratioLabelFontColor
ratioLabel.sizeToFit()
ratioLabel.frame.size = (ratioLabel.text as! NSString).boundingRect(
with: CGSize(width: prop.progressSize, height: CGFloat.infinity),
options: .usesLineFragmentOrigin,
attributes: [.font: ratioLabel.font],
context: nil).size
ratioLabel.center = center
ratioLabel.adjustsFontSizeToFitWidth = true

addSubview(ratioLabel)
}
Expand Down
7 changes: 6 additions & 1 deletion source/Progress/Core/ProgressAtRatioView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,13 @@ class ProgressAtRatioView: UIView {
ratioLabel.font = prop.ratioLabelFont
ratioLabel.textAlignment = NSTextAlignment.right
ratioLabel.textColor = prop.ratioLabelFontColor
ratioLabel.sizeToFit()
ratioLabel.frame.size = (ratioLabel.text as! NSString).boundingRect(
with: CGSize(width: prop.progressSize, height: CGFloat.infinity),
options: .usesLineFragmentOrigin,
attributes: [.font: ratioLabel.font],
context: nil).size
ratioLabel.center = center
ratioLabel.adjustsFontSizeToFitWidth = true

addSubview(ratioLabel)
}
Expand Down