Tweak some timeline settings.

This commit is contained in:
Brent Simmons 2018-02-23 23:03:01 -08:00
parent 94b71d1464
commit 443958423e
3 changed files with 7 additions and 5 deletions

View File

@ -18,6 +18,7 @@ struct TimelineCellAppearance: Equatable {
let dateColor: NSColor let dateColor: NSColor
let dateMarginLeft: CGFloat let dateMarginLeft: CGFloat
let dateMarginBottom: CGFloat
let dateFont: NSFont let dateFont: NSFont
let titleColor: NSColor let titleColor: NSColor
@ -61,8 +62,9 @@ struct TimelineCellAppearance: Equatable {
self.feedNameFont = NSFont.systemFont(ofSize: smallItemFontSize) self.feedNameFont = NSFont.systemFont(ofSize: smallItemFontSize)
self.dateColor = theme.color(forKey: "MainWindow.Timeline.cell.dateColor") self.dateColor = theme.color(forKey: "MainWindow.Timeline.cell.dateColor")
self.dateFont = NSFont.systemFont(ofSize: smallItemFontSize) self.dateFont = NSFont.systemFont(ofSize: smallItemFontSize, weight: NSFont.Weight.bold)
self.dateMarginLeft = theme.float(forKey: "MainWindow.Timeline.cell.dateMarginLeft") self.dateMarginLeft = theme.float(forKey: "MainWindow.Timeline.cell.dateMarginLeft")
self.dateMarginBottom = theme.float(forKey: "MainWindow.Timeline.cell.dateMarginBottom")
self.titleColor = theme.color(forKey: "MainWindow.Timeline.cell.titleColor") self.titleColor = theme.color(forKey: "MainWindow.Timeline.cell.titleColor")
self.titleFont = NSFont.systemFont(ofSize: largeItemFontSize, weight: NSFont.Weight.semibold) self.titleFont = NSFont.systemFont(ofSize: largeItemFontSize, weight: NSFont.Weight.semibold)

View File

@ -148,7 +148,7 @@ private extension TimelineCellLayout {
return NSZeroRect return NSZeroRect
} }
return rectOfLineBelow(textBoxRect, dateRect, appearance.titleBottomMargin, cellData.feedName, appearance.feedNameFont) return rectOfLineBelow(textBoxRect, dateRect, appearance.dateMarginBottom, cellData.feedName, appearance.feedNameFont)
} }
static func rectOfLineBelow(_ textBoxRect: NSRect, _ rectAbove: NSRect, _ topMargin: CGFloat, _ value: String, _ font: NSFont) -> NSRect { static func rectOfLineBelow(_ textBoxRect: NSRect, _ rectAbove: NSRect, _ topMargin: CGFloat, _ value: String, _ font: NSFont) -> NSRect {

View File

@ -80,7 +80,7 @@
<key>paddingRight</key> <key>paddingRight</key>
<integer>20</integer> <integer>20</integer>
<key>paddingTop</key> <key>paddingTop</key>
<integer>16</integer> <integer>14</integer>
<key>paddingBottom</key> <key>paddingBottom</key>
<integer>16</integer> <integer>16</integer>
<key>feedNameColor</key> <key>feedNameColor</key>
@ -92,9 +92,9 @@
<key>dateMarginLeft</key> <key>dateMarginLeft</key>
<integer>10</integer> <integer>10</integer>
<key>dateMarginBottom</key> <key>dateMarginBottom</key>
<integer>2</integer> <integer>1</integer>
<key>textColor</key> <key>textColor</key>
<string>aaaaaa</string> <string>999999</string>
<key>textOnlyColor</key> <key>textOnlyColor</key>
<string>222222</string> <string>222222</string>
<key>titleColor</key> <key>titleColor</key>