diff --git a/AltStore/My Apps/MyAppsViewController.swift b/AltStore/My Apps/MyAppsViewController.swift index 7906e71a..a7dee21c 100644 --- a/AltStore/My Apps/MyAppsViewController.swift +++ b/AltStore/My Apps/MyAppsViewController.swift @@ -282,11 +282,8 @@ private extension MyAppsViewController } cell.versionDescriptionTextView.toggleButton.addTarget(self, action: #selector(MyAppsViewController.toggleUpdateCellMode(_:)), for: .primaryActionTriggered) - + cell.setNeedsLayout() - - // Below lines are necessary to avoid "more" button layout issues. - cell.versionDescriptionTextView.setNeedsLayout() cell.layoutIfNeeded() } dataSource.prefetchHandler = { (installedApp, indexPath, completionHandler) in diff --git a/AltStore/My Apps/UpdateCollectionViewCell.swift b/AltStore/My Apps/UpdateCollectionViewCell.swift index 4dce613e..32b82770 100644 --- a/AltStore/My Apps/UpdateCollectionViewCell.swift +++ b/AltStore/My Apps/UpdateCollectionViewCell.swift @@ -92,16 +92,16 @@ extension UpdateCollectionViewCell } } - override func systemLayoutSizeFitting(_ targetSize: CGSize, withHorizontalFittingPriority horizontalFittingPriority: UILayoutPriority, verticalFittingPriority: UILayoutPriority) -> CGSize - { - // Ensure cell is laid out so it will report correct size. - self.versionDescriptionTextView.setNeedsLayout() - self.versionDescriptionTextView.layoutIfNeeded() - - let size = super.systemLayoutSizeFitting(targetSize, withHorizontalFittingPriority: horizontalFittingPriority, verticalFittingPriority: verticalFittingPriority) - - return size - } +// override func systemLayoutSizeFitting(_ targetSize: CGSize, withHorizontalFittingPriority horizontalFittingPriority: UILayoutPriority, verticalFittingPriority: UILayoutPriority) -> CGSize +// { +// // Ensure cell is laid out so it will report correct size. +// self.versionDescriptionTextView.setNeedsLayout() +// self.versionDescriptionTextView.layoutIfNeeded() +// +// let size = super.systemLayoutSizeFitting(targetSize, withHorizontalFittingPriority: horizontalFittingPriority, verticalFittingPriority: verticalFittingPriority) +// +// return size +// } } private extension UpdateCollectionViewCell diff --git a/SideStore/Views/UIKit/CollapsingMarkdownView.swift b/SideStore/Views/UIKit/CollapsingMarkdownView.swift index 248ee3ee..133f092c 100644 --- a/SideStore/Views/UIKit/CollapsingMarkdownView.swift +++ b/SideStore/Views/UIKit/CollapsingMarkdownView.swift @@ -64,14 +64,12 @@ final class CollapsingMarkdownView: UIView { var text: String = "" { didSet { self.updateMarkdownContent() - self.shouldResetLayout = true self.setNeedsLayout() } } var lineSpacing: Double = 2 { didSet { - self.shouldResetLayout = true self.setNeedsLayout() } } @@ -81,7 +79,6 @@ final class CollapsingMarkdownView: UIView { private let textView = UITextView() private let markdownParser = MarkdownManager().markdownParser - private var shouldResetLayout: Bool = false private var previousSize: CGSize? // MARK: - Initialization @@ -212,9 +209,8 @@ final class CollapsingMarkdownView: UIView { textView.frame = bounds // Check if content needs collapsing when layout changes - if shouldResetLayout || previousSize?.width != bounds.width { + if previousSize?.width != bounds.width { checkIfNeedsCollapsing() - shouldResetLayout = false previousSize = bounds.size }