FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Draw a white unread indicator in the timeline when the cell is selected and emphasized. Fix #112.

Browse Source
This commit is contained in:
Brent Simmons 2018-01-06 14:33:16 -08:00
parent 36b3ad8e85
commit 0a1642abdf
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift
View File

@ -62,6 +62,7 @@ class TimelineTableCellView: NSTableCellView {
dateView.emphasized = isEmphasized dateView.emphasized = isEmphasized
feedNameView.emphasized = isEmphasized feedNameView.emphasized = isEmphasized
titleView.emphasized = isEmphasized titleView.emphasized = isEmphasized
unreadIndicatorView.isEmphasized = isEmphasized
needsDisplay = true needsDisplay = true
} }
} }
@ -71,6 +72,7 @@ class TimelineTableCellView: NSTableCellView {
dateView.selected = isSelected dateView.selected = isSelected
feedNameView.selected = isSelected feedNameView.selected = isSelected
titleView.selected = isSelected titleView.selected = isSelected
unreadIndicatorView.isSelected = isSelected
needsDisplay = true needsDisplay = true
} }
} }

19
Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift
View File

@ -19,9 +19,26 @@ class UnreadIndicatorView: NSView {
static let unreadCircleColor = appDelegate.currentTheme.color(forKey: "MainWindow.Timeline.cell.unreadCircleColor") static let unreadCircleColor = appDelegate.currentTheme.color(forKey: "MainWindow.Timeline.cell.unreadCircleColor")
var isEmphasized = false {
didSet {
if isEmphasized != oldValue {
needsDisplay = true
}
}
}
var isSelected = false {
didSet {
if isSelected != oldValue {
needsDisplay = true
}
}
}
override func draw(_ dirtyRect: NSRect) { override func draw(_ dirtyRect: NSRect) {
UnreadIndicatorView.unreadCircleColor.setFill() let color = isEmphasized && isSelected ? NSColor.white : UnreadIndicatorView.unreadCircleColor
color.setFill()
UnreadIndicatorView.bezierPath.fill() UnreadIndicatorView.bezierPath.fill()
} }