zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 20 Releases Wiki Activity

fix sizing if the text view does not need to scroll

This commit is contained in:
Jed Fox 2022-12-23 12:08:46 -05:00
parent d0812f4275
commit 752d76c8be
No known key found for this signature in database
GPG Key ID: 0B61D18EA54B47E1
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Mastodon/Scene/MediaPreview/AltViewController.swift
View File

@ -9,7 +9,14 @@ import SwiftUI
class AltViewController: UIViewController { class AltViewController: UIViewController {
private var alt: String private var alt: String
let label = UITextView() let label = {
if #available(iOS 16, *) {
// TODO: update code below to use TextKit 2 when dropping iOS 15 support
return UITextView(usingTextLayoutManager: false)
} else {
return UITextView()
}
}()
init(alt: String, sourceView: UIView?) { init(alt: String, sourceView: UIView?) {
self.alt = alt self.alt = alt
@ -49,7 +56,8 @@ class AltViewController: UIViewController {
label.isEditable = false label.isEditable = false
label.tintColor = .white label.tintColor = .white
label.text = alt label.text = alt
label.textContainerInset = UIEdgeInsets(horizontal: 8, vertical: 16) label.textContainerInset = UIEdgeInsets(top: 12, left: 8, bottom: 8, right: 8)
label.contentInsetAdjustmentBehavior = .always
label.verticalScrollIndicatorInsets.bottom = 4 label.verticalScrollIndicatorInsets.bottom = 4
view.backgroundColor = .systemBackground view.backgroundColor = .systemBackground
@ -64,9 +72,10 @@ class AltViewController: UIViewController {
override func viewDidLayoutSubviews() { override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews() super.viewDidLayoutSubviews()
UIView.performWithoutAnimation { UIView.performWithoutAnimation {
let size = label.layoutManager.boundingRect(forGlyphRange: NSMakeRange(0, (label.textStorage.string as NSString).length), in: label.textContainer).size
preferredContentSize = CGSize( preferredContentSize = CGSize(
width: label.contentSize.width + 16, width: size.width + (8 + label.textContainer.lineFragmentPadding) * 2,
height: label.contentSize.height + view.layoutMargins.top + view.layoutMargins.bottom height: size.height + 12 + (label.textContainer.lineFragmentPadding * 2)
) )
} }
} }