-
Notifications
You must be signed in to change notification settings - Fork 147
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.
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
Support alternate bullet style per level #1354
Open
cbess
wants to merge
6
commits into
wordpress-mobile:develop
Choose a base branch
from
cbess:ul-indent-styles
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
380523a
support alternate bullet style per level
cbess 4f27745
cleanup whitespace
cbess 08c85ec
Squashed commit of the following:
cbess 2b59a4d
add TextList.IndentStyle
cbess 9568191
satisfy hound
cbess 49a5925
Merge branch 'develop' into ul-indent-styles
cbess File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -213,15 +213,16 @@ private extension LayoutManager { | |
} | ||
|
||
let characterRange = self.characterRange(forGlyphRange: glyphsToShow, actualGlyphRange: nil) | ||
var firstLevelWidth: CGFloat? | ||
|
||
textStorage.enumerateParagraphRanges(spanning: characterRange) { (range, enclosingRange) in | ||
|
||
guard textStorage.string.isStartOfNewLine(atUTF16Offset: enclosingRange.location), | ||
let paragraphStyle = textStorage.attribute(.paragraphStyle, at: enclosingRange.location, effectiveRange: nil) as? ParagraphStyle, | ||
let list = paragraphStyle.lists.last | ||
else { | ||
return | ||
} | ||
|
||
let attributes = textStorage.attributes(at: enclosingRange.location, effectiveRange: nil) | ||
let glyphRange = self.glyphRange(forCharacterRange: enclosingRange, actualCharacterRange: nil) | ||
let markerRect = rectForItem(range: glyphRange, origin: origin, paragraphStyle: paragraphStyle) | ||
|
@@ -233,8 +234,24 @@ private extension LayoutManager { | |
start = textStorage.numberOfItems(in: list, at: enclosingRange.location) | ||
} | ||
} | ||
|
||
// determine indentation level | ||
var indentLevel = 1 | ||
if list.style == .unordered { | ||
// only get the width of the first level once | ||
if firstLevelWidth == nil { | ||
firstLevelWidth = paragraphStyle.indentToFirst(TextList.self) | ||
} | ||
|
||
// calculate current indent level | ||
let indentWidth = paragraphStyle.indentToLast(TextList.self) | ||
if let firstLevelWidth = firstLevelWidth { | ||
indentLevel = Int(indentWidth / firstLevelWidth) | ||
} | ||
} | ||
|
||
markerNumber += start | ||
let markerString = list.style.markerText(forItemNumber: markerNumber) | ||
let markerString = list.style.markerText(forItemNumber: markerNumber, indentLevel: indentLevel) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: The |
||
drawItem(markerString, in: markerRect, styled: attributes, at: enclosingRange.location) | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: I'd consider refactoring this since we know that at this point
firstLevelWidth
should never benil
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed