|
@@ -447,12 +447,25 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
}()
|
|
|
|
|
|
var preThumbnailRow: Int = 0
|
|
|
+ var leftMargin: CGFloat = 0
|
|
|
+
|
|
|
+ lazy var leftView: KMBotaLeftView = {
|
|
|
+ let view = KMBotaLeftView()
|
|
|
+ return view
|
|
|
+ }()
|
|
|
|
|
|
override func loadView() {
|
|
|
super.loadView()
|
|
|
|
|
|
self.view.wantsLayer = true
|
|
|
self.view.layer?.backgroundColor = KMAppearance.Layout.l0Color().cgColor
|
|
|
+
|
|
|
+ self.view.addSubview(self.leftView)
|
|
|
+ self.leftView.frame = NSMakeRect(0, 0, 44, NSHeight(self.view.frame))
|
|
|
+ self.leftView.autoresizingMask = [.height]
|
|
|
+ self.leftView.wantsLayer = true
|
|
|
+ self.leftView.layer?.backgroundColor = .white
|
|
|
+
|
|
|
self.outlineView.wantsLayer = true
|
|
|
self.outlineView.layer?.backgroundColor = KMAppearance.Layout.l0Color().cgColor
|
|
|
self.noteView.wantsLayer = true
|
|
@@ -723,24 +736,7 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
}
|
|
|
}
|
|
|
// [mainController bind:@"findPaneState" toObject:searchViewController.segmentedControl withKeyPath:@"selectedSegment" options:nil];
|
|
|
-
|
|
|
- self.segmentedControl.segmentCount = 5
|
|
|
- self.segmentedControl.setImage(NSImage(named: KMImageNameUXIconSidetabbarThumbnailNor)!, for: 0)
|
|
|
- self.segmentedControl.setImage(NSImage(named: KMImageNameUXIconSidetabbarOutlineNor)!, for: 1)
|
|
|
- self.segmentedControl.setImage(NSImage(named: KMImageNameUXIconSidetabbarAnnotationNor)!, for: 2)
|
|
|
- self.segmentedControl.setImage(NSImage(named: KMImageNameUXIconSidetabbarSnapshotNor)!, for: 3)
|
|
|
- self.segmentedControl.setImage(NSImage(named: KMImageNameUXIconSidetabbarSearchNor)!, for: 4)
|
|
|
- self.segmentedControl.setToolTip(KMLocalizedString("View Thumbnails", nil), for: 0)
|
|
|
- self.segmentedControl.setToolTip(KMLocalizedString("View Outline", nil), for: 1)
|
|
|
- self.segmentedControl.setToolTip(KMLocalizedString("View Notes", nil), for: 2)
|
|
|
- self.segmentedControl.setToolTip(KMLocalizedString("View Snapshots", nil), for: 3)
|
|
|
- self.segmentedControl.setToolTip(KMLocalizedString("Search", nil), for: 4)
|
|
|
- self.segmentedControl.selectedSegment = 0
|
|
|
-// [segmentedControl bind:@"selectedSegment" toObject:mainController withKeyPath:@"leftSidePaneState" options:nil];
|
|
|
-// [mainController bind:@"leftSidePaneState" toObject:segmentedControl withKeyPath:@"selectedSegment" options:nil];
|
|
|
- self.segmentedControl.wantsLayer = true
|
|
|
- self.segmentedControl.layer?.backgroundColor = KMAppearance.Layout.l_1Color().cgColor
|
|
|
- self.segmentedControl.block = { [unowned self] segIndex in
|
|
|
+ self.leftView.segmentedControl.block = { [unowned self] segIndex in
|
|
|
self.toolButtonBox.isHidden = false
|
|
|
self.toolButtonBoxLayoutConstraint.constant = 40.0
|
|
|
|
|
@@ -834,20 +830,23 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
|
|
|
var frame = self.thumbnailTableView.enclosingScrollView?.frame ?? .zero
|
|
|
frame.origin.y = 0
|
|
|
+ frame.origin.x = self.leftMargin
|
|
|
frame.size.height = self.thumbnailTableView.enclosingScrollView?.superview?.frame.size.height ?? 0
|
|
|
self.thumbnailTableView.enclosingScrollView?.frame = frame
|
|
|
|
|
|
self.resetThumbnails()
|
|
|
|
|
|
-// frame = rightSideController.noteOutlineView.enclosingScrollView.frame;
|
|
|
-// frame.origin.y = 0;
|
|
|
-// frame.size.height = rightSideController.noteOutlineView.enclosingScrollView.superview.frame.size.height;
|
|
|
-// rightSideController.noteOutlineView.enclosingScrollView.frame = frame;
|
|
|
+ frame = self.noteOutlineView.enclosingScrollView?.frame ?? .zero
|
|
|
+ frame.origin.y = 0
|
|
|
+ frame.origin.x = self.leftMargin
|
|
|
+ frame.size.height = self.noteOutlineView.enclosingScrollView?.superview?.frame.size.height ?? 0
|
|
|
+ self.noteOutlineView.enclosingScrollView?.frame = frame
|
|
|
|
|
|
-// frame = rightSideController.snapshotTableView.enclosingScrollView.frame;
|
|
|
-// frame.origin.y = 0;
|
|
|
-// frame.size.height = rightSideController.snapshotTableView.enclosingScrollView.superview.frame.size.height;
|
|
|
-// rightSideController.snapshotTableView.enclosingScrollView.frame = frame;
|
|
|
+ frame = self.snapshotTableView.enclosingScrollView?.frame ?? .zero
|
|
|
+ frame.origin.y = 0
|
|
|
+ frame.origin.x = self.leftMargin
|
|
|
+ frame.size.height = self.snapshotTableView.enclosingScrollView?.superview?.frame.size.height ?? 0
|
|
|
+ self.snapshotTableView.enclosingScrollView?.frame = frame
|
|
|
|
|
|
// [self updateThumbnailSelection];
|
|
|
}
|
|
@@ -3262,7 +3261,7 @@ extension KMLeftSideViewController: NSOutlineViewDelegate, NSOutlineViewDataSour
|
|
|
self.leftSideEmptyVC.exportAnnotationBtn.isEnabled = false
|
|
|
self.leftSideEmptyVC.deleteAnnotationBtn.isEnabled = false
|
|
|
//
|
|
|
- if (self.segmentedControl.selectedSegment == KMSelectedSegmentType.annotation.rawValue) {
|
|
|
+ if (self.leftView.segmentedControl.selectedSegment == KMSelectedSegmentType.annotation.rawValue) {
|
|
|
self.noteHeaderView.isHidden = true
|
|
|
self.toolButtonBoxLayoutConstraint.constant = 40.0
|
|
|
}
|
|
@@ -3276,7 +3275,7 @@ extension KMLeftSideViewController: NSOutlineViewDelegate, NSOutlineViewDataSour
|
|
|
self.leftSideEmptyVC.exportAnnotationBtn.isEnabled = true
|
|
|
self.leftSideEmptyVC.deleteAnnotationBtn.isEnabled = true
|
|
|
//
|
|
|
- if (self.segmentedControl.selectedSegment == KMSelectedSegmentType.annotation.rawValue) {
|
|
|
+ if (self.leftView.segmentedControl.selectedSegment == KMSelectedSegmentType.annotation.rawValue) {
|
|
|
self.noteHeaderView.isHidden = false
|
|
|
self.toolButtonBoxLayoutConstraint.constant = 64.0
|
|
|
}
|