shadowfacts/splash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace custom Color struct with typealiases

Browse Source 
Now that the decision not to support colors on Linux
has been made, we can replace the custom `Color` struct
with simple typealiases for `NSColor` and `UIColor`.

The same can’t be done for font, since we want to enable
loading of a font from a path, for SPM packages.
This commit is contained in:
John Sundell 2018-08-26 22:49:39 +02:00
parent 0155f41ceb
commit a68e461eb4
2 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Splash/Output/AttributedStringOutputFormat.swift
View File

@ -56,7 +56,7 @@ public extension AttributedStringOutputFormat {
private extension NSMutableAttributedString { private extension NSMutableAttributedString {
func append(_ string: String, font: Font.Loaded, color: Color) { func append(_ string: String, font: Font.Loaded, color: Color) {
let attributedString = NSAttributedString(string: string, attributes: [ let attributedString = NSAttributedString(string: string, attributes: [
.foregroundColor: color.renderable, .foregroundColor: color,
.font: font .font: font
]) ])

51
Sources/Splash/Theming/Color.swift
View File

@ -4,55 +4,16 @@
* MIT license - see LICENSE.md * MIT license - see LICENSE.md
*/ */
import Foundation
#if !os(Linux)
/// A representation of a color, for use with a `Theme`.
/// Since Splash aims to be cross-platform, it uses this
/// simplified color representation rather than `NSColor`
/// or `UIColor`.
public struct Color {
public var red: Double
public var green: Double
public var blue: Double
public var alpha: Double
public init(red: Double, green: Double, blue: Double, alpha: Double = 1) {
self.red = red
self.green = green
self.blue = blue
self.alpha = alpha
}
}
internal extension Color {
var renderable: Renderable {
return Renderable(
red: CGFloat(red),
green: CGFloat(green),
blue: CGFloat(blue),
alpha: CGFloat(alpha)
)
}
}
#endif
#if os(iOS) #if os(iOS)
import UIKit import UIKit
public typealias Color = UIColor
internal extension Color {
typealias Renderable = UIColor
}
#elseif os(macOS) #elseif os(macOS)
import Cocoa import Cocoa
public typealias Color = NSColor
#endif
internal extension Color { internal extension Color {
typealias Renderable = NSColor convenience init(red: CGFloat, green: CGFloat, blue: CGFloat) {
self.init(red: red, green: green, blue: blue, alpha: 1)
}
} }
#endif