|
@@ -97,7 +97,6 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
|
|
var timerCheckLink: Timer?
|
|
var timerCheckLink: Timer?
|
|
var timerLongPressLink: Timer?
|
|
var timerLongPressLink: Timer?
|
|
var timerFakeProgress: Timer?
|
|
var timerFakeProgress: Timer?
|
|
- var lastTouchPoint: CGPoint = .zero
|
|
|
|
var showMenuContext = false
|
|
var showMenuContext = false
|
|
var touchedSubview = UIView()
|
|
var touchedSubview = UIView()
|
|
var listViewOnSection: [UIView] = []
|
|
var listViewOnSection: [UIView] = []
|
|
@@ -6140,15 +6139,17 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
|
|
guard let text = label.text else { return nil }
|
|
guard let text = label.text else { return nil }
|
|
|
|
|
|
let layoutManager = NSLayoutManager()
|
|
let layoutManager = NSLayoutManager()
|
|
- let textContainer = NSTextContainer(size: label.frame.size)
|
|
|
|
- let textStorage = NSTextStorage(attributedString: NSAttributedString(string: text))
|
|
|
|
|
|
+ let textContainer = NSTextContainer(size: .zero)
|
|
|
|
+ let textStorage = NSTextStorage(attributedString: label.attributedText ?? NSAttributedString())
|
|
|
|
|
|
layoutManager.addTextContainer(textContainer)
|
|
layoutManager.addTextContainer(textContainer)
|
|
textStorage.addLayoutManager(layoutManager)
|
|
textStorage.addLayoutManager(layoutManager)
|
|
- textContainer.lineFragmentPadding = 0
|
|
|
|
|
|
+
|
|
|
|
+ textContainer.lineFragmentPadding = 0.0
|
|
|
|
+ textContainer.lineBreakMode = label.lineBreakMode
|
|
textContainer.maximumNumberOfLines = label.numberOfLines
|
|
textContainer.maximumNumberOfLines = label.numberOfLines
|
|
|
|
+ textContainer.size = label.bounds.size
|
|
|
|
|
|
- lastTouchPoint = point
|
|
|
|
let characterIndex = layoutManager.characterIndex(for: point, in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil)
|
|
let characterIndex = layoutManager.characterIndex(for: point, in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil)
|
|
|
|
|
|
if characterIndex == text.count - 1 {
|
|
if characterIndex == text.count - 1 {
|
|
@@ -6182,8 +6183,8 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
|
|
}
|
|
}
|
|
|
|
|
|
@objc func tapMessageText(_ sender: ObjectGesture) {
|
|
@objc func tapMessageText(_ sender: ObjectGesture) {
|
|
- var stringURl = sender.message_id.lowercased()
|
|
|
|
- if stringURl.starts(with: "www.") {
|
|
|
|
|
|
+ var stringURl = sender.message_id
|
|
|
|
+ if stringURl.lowercased().starts(with: "www.") {
|
|
stringURl = "https://" + stringURl.replacingOccurrences(of: "www.", with: "")
|
|
stringURl = "https://" + stringURl.replacingOccurrences(of: "www.", with: "")
|
|
}
|
|
}
|
|
guard let url = URL(string: stringURl) else { return }
|
|
guard let url = URL(string: stringURl) else { return }
|