Merge branch 'master' of https://github.com/brentsimmons/Evergreen
This commit is contained in:
Brent Simmons
commit
75bf0bf1da
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14295.6" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14306.4" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14295.6"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14306.4"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
|
|
@ -236,7 +236,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="581" height="300"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
<subviews>
|
||||
<containerView appearanceType="aqua" translatesAutoresizingMaskIntoConstraints="NO" id="K1o-Ws-XMQ">
|
||||
<containerView translatesAutoresizingMaskIntoConstraints="NO" id="K1o-Ws-XMQ">
|
||||
<rect key="frame" x="0.0" y="0.0" width="581" height="300"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="backgroundColor">
|
||||
|
|
@ -351,11 +351,11 @@
|
|||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="pzy-wh-tgi"/>
|
||||
</constraints>
|
||||
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="vs5-5h-CXe">
|
||||
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="vs5-5h-CXe">
|
||||
<rect key="frame" x="-100" y="-100" width="238" height="15"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
</scroller>
|
||||
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="FWV-kB-qct">
|
||||
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="FWV-kB-qct">
|
||||
<rect key="frame" x="224" y="17" width="15" height="102"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
</scroller>
|
||||
|
|
@ -364,7 +364,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="166" height="28"/>
|
||||
<subviews>
|
||||
<popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="gZE-LB-FdW">
|
||||
<rect key="frame" x="8" y="4" width="40" height="19"/>
|
||||
<rect key="frame" x="8" y="3" width="40" height="23"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="40" id="7UB-w9-Vc2"/>
|
||||
</constraints>
|
||||
|
|
@ -390,7 +390,7 @@
|
|||
</constraints>
|
||||
</progressIndicator>
|
||||
<textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iyL-pW-cT6">
|
||||
<rect key="frame" x="98" y="6" width="62" height="17"/>
|
||||
<rect key="frame" x="98" y="5" width="62" height="18"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="dVE-XG-mlU">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
|
||||
|
|
@ -491,7 +491,7 @@
|
|||
<rect key="frame" x="0.0" y="-2" width="450" height="5"/>
|
||||
</box>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xi3-Wb-g8i">
|
||||
<rect key="frame" x="30" y="8" width="141" height="17"/>
|
||||
<rect key="frame" x="30" y="7" width="141" height="18"/>
|
||||
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Feed Name Goes Here" usesSingleLineMode="YES" id="rUx-Cw-Etb">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
|
|
@ -499,7 +499,7 @@
|
|||
</textFieldCell>
|
||||
</textField>
|
||||
<popUpButton horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="nD3-Ps-HWV">
|
||||
<rect key="frame" x="317" y="6" width="113" height="21"/>
|
||||
<rect key="frame" x="316" y="5" width="114" height="22"/>
|
||||
<popUpButtonCell key="cell" type="bevel" title="Newest at Top" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" selectedItem="Va5-4d-T8y" id="4y3-td-JFr">
|
||||
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="menu"/>
|
||||
|
|
@ -534,18 +534,17 @@
|
|||
<constraint firstItem="KZz-oC-IY4" firstAttribute="leading" secondItem="rE6-fd-xjY" secondAttribute="leading" id="dqI-OO-8A0"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="97" horizontalPageScroll="10" verticalLineScroll="97" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="Kfs-n2-RYk">
|
||||
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="96" horizontalPageScroll="10" verticalLineScroll="96" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="Kfs-n2-RYk">
|
||||
<rect key="frame" x="0.0" y="0.0" width="450" height="198"/>
|
||||
<clipView key="contentView" copiesOnScroll="NO" id="yAN-Ex-RC7">
|
||||
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="yAN-Ex-RC7">
|
||||
<rect key="frame" x="0.0" y="0.0" width="450" height="198"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="96" viewBased="YES" id="DRs-j8-R9a" customClass="TimelineTableView" customModule="Evergreen" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="450" height="198"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<size key="intercellSpacing" width="0.0" height="1"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<color key="gridColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
|
||||
<tableColumns>
|
||||
<tableColumn width="447" minWidth="40" maxWidth="1000" id="5h5-G1-xGq">
|
||||
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
|
||||
|
|
@ -565,7 +564,7 @@
|
|||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
</tableCellView>
|
||||
<customView identifier="timelineRow" id="54E-Vz-WND" customClass="TimelineTableRowView" customModule="Evergreen" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="69" width="447" height="96"/>
|
||||
<rect key="frame" x="0.0" y="68" width="447" height="96"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
</customView>
|
||||
</prototypeCellViews>
|
||||
|
|
@ -579,13 +578,13 @@
|
|||
</connections>
|
||||
</tableView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<nil key="backgroundColor"/>
|
||||
</clipView>
|
||||
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="9r2-h4-K46">
|
||||
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="9r2-h4-K46">
|
||||
<rect key="frame" x="-100" y="-100" width="223" height="15"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
</scroller>
|
||||
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="hSI-DO-hVu">
|
||||
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="hSI-DO-hVu">
|
||||
<rect key="frame" x="224" y="17" width="15" height="102"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
</scroller>
|
||||
|
|
@ -760,15 +759,15 @@
|
|||
</scenes>
|
||||
<resources>
|
||||
<image name="NSAddTemplate" width="11" height="11"/>
|
||||
<image name="NSMobileMe" width="32" height="32"/>
|
||||
<image name="NSMobileMe" width="128" height="128"/>
|
||||
<image name="NSRefreshTemplate" width="11" height="15"/>
|
||||
<image name="NSShareTemplate" width="11" height="16"/>
|
||||
<image name="action" width="9.5" height="9.5"/>
|
||||
<image name="markAllRead" width="11" height="9.5"/>
|
||||
<image name="markRead" width="9.5" height="9.5"/>
|
||||
<image name="newFolder" width="9.5" height="9.5"/>
|
||||
<image name="nextUnread" width="12" height="9.5"/>
|
||||
<image name="openInBrowser" width="9.5" height="9.5"/>
|
||||
<image name="star" width="9.5" height="9.5"/>
|
||||
<image name="action" width="19" height="19"/>
|
||||
<image name="markAllRead" width="22" height="19"/>
|
||||
<image name="markRead" width="19" height="19"/>
|
||||
<image name="newFolder" width="19" height="19"/>
|
||||
<image name="nextUnread" width="24" height="19"/>
|
||||
<image name="openInBrowser" width="19" height="19"/>
|
||||
<image name="star" width="19" height="19"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ import AppKit
|
|||
|
||||
class MainWindowSplitView: NSSplitView {
|
||||
|
||||
private let splitViewDividerColor = NSColor(calibratedWhite: 0.75, alpha: 1.0)
|
||||
|
||||
override var dividerColor: NSColor {
|
||||
return splitViewDividerColor
|
||||
}
|
||||
// private let splitViewDividerColor = NSColor(calibratedWhite: 0.75, alpha: 1.0)
|
||||
//
|
||||
// override var dividerColor: NSColor {
|
||||
// return splitViewDividerColor
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,13 +48,13 @@ class TimelineTableCellView: NSTableCellView {
|
|||
return true
|
||||
}
|
||||
|
||||
override var isOpaque: Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
override var wantsUpdateLayer: Bool {
|
||||
return true
|
||||
}
|
||||
// override var isOpaque: Bool {
|
||||
// return true
|
||||
// }
|
||||
//
|
||||
// override var wantsUpdateLayer: Bool {
|
||||
// return true
|
||||
// }
|
||||
|
||||
var isEmphasized = false {
|
||||
didSet {
|
||||
|
|
@ -122,20 +122,20 @@ class TimelineTableCellView: NSTableCellView {
|
|||
starView.rs_setFrameIfNotEqual(layoutRects.starRect)
|
||||
}
|
||||
|
||||
override func updateLayer() {
|
||||
|
||||
let color: NSColor
|
||||
if isSelected {
|
||||
color = isEmphasized ? NSColor.alternateSelectedControlColor : NSColor.secondarySelectedControlColor
|
||||
}
|
||||
else {
|
||||
color = NSColor.white
|
||||
}
|
||||
|
||||
if layer?.backgroundColor != color.cgColor {
|
||||
layer?.backgroundColor = color.cgColor
|
||||
}
|
||||
}
|
||||
// override func updateLayer() {
|
||||
//
|
||||
// let color: NSColor
|
||||
// if isSelected {
|
||||
// color = isEmphasized ? NSColor.alternateSelectedControlColor : NSColor.secondarySelectedControlColor
|
||||
// }
|
||||
// else {
|
||||
// color = NSColor.white
|
||||
// }
|
||||
//
|
||||
// if layer?.backgroundColor != color.cgColor {
|
||||
// layer?.backgroundColor = color.cgColor
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
// MARK: - Private
|
||||
|
|
@ -189,16 +189,22 @@ private extension TimelineTableCellView {
|
|||
|
||||
updateTitleView()
|
||||
|
||||
if isEmphasized && isSelected {
|
||||
textFields.forEach { $0.textColor = NSColor.white }
|
||||
}
|
||||
else {
|
||||
feedNameView.textColor = cellAppearance.feedNameColor
|
||||
dateView.textColor = cellAppearance.dateColor
|
||||
titleView.textColor = cellAppearance.titleColor
|
||||
summaryView.textColor = cellAppearance.textColor
|
||||
textView.textColor = cellAppearance.textOnlyColor
|
||||
}
|
||||
titleView.textColor = NSColor.labelColor
|
||||
feedNameView.textColor = NSColor.secondaryLabelColor
|
||||
dateView.textColor = NSColor.secondaryLabelColor
|
||||
summaryView.textColor = NSColor.secondaryLabelColor
|
||||
textView.textColor = NSColor.labelColor
|
||||
|
||||
// if isEmphasized && isSelected {
|
||||
// textFields.forEach { $0.textColor = NSColor.white }
|
||||
// }
|
||||
// else {
|
||||
// feedNameView.textColor = cellAppearance.feedNameColor
|
||||
// dateView.textColor = cellAppearance.dateColor
|
||||
// titleView.textColor = cellAppearance.titleColor
|
||||
// summaryView.textColor = cellAppearance.textColor
|
||||
// textView.textColor = cellAppearance.textOnlyColor
|
||||
// }
|
||||
}
|
||||
|
||||
func updateTextFieldFonts() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue