dnrops
/
DynamicColor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflict

This commit is contained in:
Yannick Loriot 2018-08-21 12:54:50 +02:00
parent 8b3e06c00f 29244bc8b1
commit 25dd7059b5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS.md
View File

@ -14,5 +14,6 @@ Please keep the list sorted.
* [Bas Broek](https://github.com/BasThomas) * [Bas Broek](https://github.com/BasThomas)
* [Julien Quéré](https://github.com/Onejjy) * [Julien Quéré](https://github.com/Onejjy)
* [naoyashiga](https://github.com/naoyashiga) * [Naoyashiga](https://github.com/naoyashiga)
* [Paulo Cesar](https://github.com/puelocesar)
* [Tobias Due Munk](https://github.com/duemunk) * [Tobias Due Munk](https://github.com/duemunk)

11
Sources/DynamicColor.swift
View File

@ -79,13 +79,13 @@ public extension DynamicColor {
- parameter alphaChannel: If true the given hex-decimal UInt32 includes the alpha channel (e.g. 0xFF0000FF). - parameter alphaChannel: If true the given hex-decimal UInt32 includes the alpha channel (e.g. 0xFF0000FF).
*/ */
public convenience init(hex: UInt32, useAlpha alphaChannel: Bool = false) { public convenience init(hex: UInt32, useAlpha alphaChannel: Bool = false) {
let mask = 0xFF let mask = UInt32(0xFF)
let cappedHex = !alphaChannel && hex > 0xffffff ? 0xffffff : hex let cappedHex = !alphaChannel && hex > 0xffffff ? 0xffffff : hex
let r = Int(cappedHex >> (alphaChannel ? 24 : 16)) & mask let r = cappedHex >> (alphaChannel ? 24 : 16) & mask
let g = Int(cappedHex >> (alphaChannel ? 16 : 8)) & mask let g = cappedHex >> (alphaChannel ? 16 : 8) & mask
let b = Int(cappedHex >> (alphaChannel ? 8 : 0)) & mask let b = cappedHex >> (alphaChannel ? 8 : 0) & mask
let a = alphaChannel ? Int(cappedHex) & mask : 255 let a = alphaChannel ? cappedHex & mask : 255
let red = CGFloat(r) / 255 let red = CGFloat(r) / 255
let green = CGFloat(g) / 255 let green = CGFloat(g) / 255
@ -111,6 +111,7 @@ public extension DynamicColor {
*/ */
public final func toHex() -> UInt32 { public final func toHex() -> UInt32 {
func roundToHex(_ x: CGFloat) -> UInt32 { func roundToHex(_ x: CGFloat) -> UInt32 {
guard x > 0 else { return 0 }
let rounded: CGFloat = round(x * 255) let rounded: CGFloat = round(x * 255)
return UInt32(rounded) return UInt32(rounded)