Update StyledTextKit with layout revert (#1911)

This commit is contained in:
Ryan Nystrom
2018-07-15 16:16:26 -04:00
committed by GitHub
parent 54aae10b9f
commit 86d5ea5b8a
3 changed files with 2 additions and 11 deletions

View File

@@ -199,7 +199,7 @@ CHECKOUT OPTIONS:
:commit: 399ae714ecd69ebf60ca5f4e2ff7822e21b91586
:git: https://github.com/GitHawkApp/Squawk.git
StyledTextKit:
:commit: 19a3b17545ca95ed863d323f448a921289cb12c0
:commit: d15f77a32203daafd71e14e6f5911528e932aca5
:git: https://github.com/GitHawkApp/StyledTextKit.git
SPEC CHECKSUMS:

2
Pods/Manifest.lock generated
View File

@@ -199,7 +199,7 @@ CHECKOUT OPTIONS:
:commit: 399ae714ecd69ebf60ca5f4e2ff7822e21b91586
:git: https://github.com/GitHawkApp/Squawk.git
StyledTextKit:
:commit: 19a3b17545ca95ed863d323f448a921289cb12c0
:commit: d15f77a32203daafd71e14e6f5911528e932aca5
:git: https://github.com/GitHawkApp/StyledTextKit.git
SPEC CHECKSUMS:

View File

@@ -24,14 +24,6 @@ open class StyledTextView: UIView {
private var longPressGesture: UILongPressGestureRecognizer?
private var highlightLayer = CAShapeLayer()
open override var intrinsicContentSize: CGSize {
if let renderer = renderer {
return renderer.viewSize(in: bounds.width)
} else {
return bounds.size
}
}
override public init(frame: CGRect) {
super.init(frame: frame)
commonInit()
@@ -197,7 +189,6 @@ open class StyledTextView: UIView {
private func setRenderResults(renderer: StyledTextRenderer, result: (CGImage?, CGSize)) {
layer.contents = result.0
frame = CGRect(origin: CGPoint(x: renderer.inset.left, y: renderer.inset.top), size: result.1)
invalidateIntrinsicContentSize()
}
static var renderQueue = DispatchQueue(