From 994426ffa1a02185ae6d09f4a9f70c523b5898a7 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 18 Feb 2018 13:00:54 -0800 Subject: [PATCH] Make drawing the grid in the timeline a DB5 option. --- .../MainWindow/Timeline/Cell/TimelineCellAppearance.swift | 4 +++- Evergreen/MainWindow/Timeline/TimelineTableRowView.swift | 8 ++++---- Evergreen/Resources/DB5.plist | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift index 2d4fc481a..4c7218f0f 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift +++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift @@ -34,6 +34,7 @@ struct TimelineCellAppearance: Equatable { let starDimension: CGFloat let gridColor: NSColor + let drawsGrid: Bool let avatarSize: NSSize let avatarMarginRight: CGFloat @@ -71,7 +72,8 @@ struct TimelineCellAppearance: Equatable { self.starDimension = theme.float(forKey: "MainWindow.Timeline.cell.starDimension") self.gridColor = theme.colorWithAlpha(forKey: "MainWindow.Timeline.gridColor") - + self.drawsGrid = theme.bool(forKey: "MainWindow.Timeline.drawsGrid") + self.avatarSize = theme.size(forKey: "MainWindow.Timeline.cell.avatar") self.avatarMarginRight = theme.float(forKey: "MainWindow.Timeline.cell.avatarMarginRight") self.avatarAdjustmentTop = theme.float(forKey: "MainWindow.Timeline.cell.avatarAdjustmentTop") diff --git a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift b/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift index 312fc92ee..03ed5b125 100644 --- a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift +++ b/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift @@ -17,11 +17,11 @@ class TimelineTableRowView : NSTableRowView { } } } - + // override var interiorBackgroundStyle: NSBackgroundStyle { // return .Light // } - + private var cellView: TimelineTableCellView? { for oneSubview in subviews { if let foundView = oneSubview as? TimelineTableCellView { @@ -50,7 +50,7 @@ class TimelineTableRowView : NSTableRowView { var gridRect: NSRect { return NSMakeRect(0.0, NSMaxY(bounds) - 1.0, NSWidth(bounds), 1) } - + override func drawSeparator(in dirtyRect: NSRect) { let path = NSBezierPath() @@ -68,7 +68,7 @@ class TimelineTableRowView : NSTableRowView { super.draw(dirtyRect) - if !isSelected && !isNextRowSelected { + if cellAppearance.drawsGrid && !isSelected && !isNextRowSelected { drawSeparator(in: dirtyRect) } } diff --git a/Evergreen/Resources/DB5.plist b/Evergreen/Resources/DB5.plist index 6188f6b17..7d1dc6ca1 100644 --- a/Evergreen/Resources/DB5.plist +++ b/Evergreen/Resources/DB5.plist @@ -66,6 +66,8 @@ 000000 gridColorAlpha 0.1 + drawsGrid + header backgroundColor