|
@@ -39,6 +39,9 @@ class StringCompareCellView : NSTableCellView {
|
|
override func awakeFromNib() {
|
|
override func awakeFromNib() {
|
|
_sepLine.wantsLayer = true;
|
|
_sepLine.wantsLayer = true;
|
|
_sepLine.layer?.backgroundColor = NSColor.lightGray.cgColor
|
|
_sepLine.layer?.backgroundColor = NSColor.lightGray.cgColor
|
|
|
|
+
|
|
|
|
+ m_textScrollView.hasVerticalScroller = false
|
|
|
|
+ m_textScrollView.horizontalScrollElasticity = .none
|
|
}
|
|
}
|
|
|
|
|
|
// Setter & Getter
|
|
// Setter & Getter
|
|
@@ -106,7 +109,7 @@ extension StringCompareCellView {
|
|
var documentAttributes:NSDictionary!
|
|
var documentAttributes:NSDictionary!
|
|
let attString = NSAttributedString.init(rtf: checkData, documentAttributes: &documentAttributes)
|
|
let attString = NSAttributedString.init(rtf: checkData, documentAttributes: &documentAttributes)
|
|
|
|
|
|
- var retSize = attString!.boundingRect(with: CGSizeMake(990, 1000),
|
|
|
|
|
|
+ var retSize = attString!.boundingRect(with: CGSizeMake(990, CGFLOAT_MAX),
|
|
options: .usesLineFragmentOrigin.union(.usesFontLeading)).size
|
|
options: .usesLineFragmentOrigin.union(.usesFontLeading)).size
|
|
|
|
|
|
return retSize.height + 50
|
|
return retSize.height + 50
|
|
@@ -118,10 +121,9 @@ extension StringCompareCellView {
|
|
class CustomScrollView: NSScrollView {
|
|
class CustomScrollView: NSScrollView {
|
|
|
|
|
|
override func scroll(_ point: NSPoint) {
|
|
override func scroll(_ point: NSPoint) {
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
override func scrollWheel(with event: NSEvent) {
|
|
override func scrollWheel(with event: NSEvent) {
|
|
- // Do nothing, effectively disabling scrolling
|
|
|
|
|
|
+ self.nextResponder?.scrollWheel(with: event);
|
|
}
|
|
}
|
|
}
|
|
}
|