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

Fix bullet point's vertical alignment of list items #1315

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Fix bullet point's vertical alignment of list items #1315

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84fed21
Fix list marker item position
fluiddot Dec 28, 2020
18c5cc6
LayoutManager yOffset changed to constant
fluiddot Dec 29, 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
13 changes: 6 additions & 7 deletions Aztec/Classes/TextKit/LayoutManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ private extension LayoutManager {
var effectiveLineRange = NSRange.zero

// Since only the first line in a paragraph can have a bullet, we only need the first line fragment.
let lineFragmentRect = self.lineFragmentRect(forGlyphAt: range.location, effectiveRange: &effectiveLineRange)
let lineFragmentUsedRect = self.lineFragmentUsedRect(forGlyphAt: range.location, effectiveRange: &effectiveLineRange)

// Whenever we're rendering an Item with multiple lines, within a Blockquote, we need to account for the
// paragraph spacing. Otherwise the Marker will show up slightly off.
Expand All @@ -265,7 +265,7 @@ private extension LayoutManager {
paddingY = Metrics.paragraphSpacing
}

return lineFragmentRect.offsetBy(dx: origin.x, dy: origin.y + paddingY)
return CGRect(origin: CGPoint(x: origin.x, y: origin.y + lineFragmentUsedRect.origin.y + paddingY), size: lineFragmentUsedRect.size)
}


Expand All @@ -284,14 +284,12 @@ private extension LayoutManager {
let markerAttributes = markerAttributesBasedOnParagraph(attributes: paragraphAttributes)
let markerAttributedText = NSAttributedString(string: markerText, attributes: markerAttributes)

var yOffset = CGFloat(0)
let markerWidth = markerAttributedText.size().width * 1.5
let markerHeight = markerAttributedText.size().height
let yOffset = CGFloat(rect.size.height / 2.0 - markerHeight / 2.0)
var xOffset = CGFloat(0)
let indentWidth = style.indentToLast(TextList.self)
let markerWidth = markerAttributedText.size().width * 1.5

if location > 0 {
yOffset += style.paragraphSpacingBefore
}
// If the marker width is larger than the indent available let's offset the area to draw to the left
if markerWidth > indentWidth {
xOffset = indentWidth - markerWidth
Expand All @@ -300,6 +298,7 @@ private extension LayoutManager {
var markerRect = rect.offsetBy(dx: xOffset, dy: yOffset)

markerRect.size.width = max(indentWidth, markerWidth)
markerRect.size.height = markerHeight

markerAttributedText.draw(in: markerRect)
}
Expand Down