Skip to content

Fix improper color opacity when using double #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JPToroDev merged 2 commits into from
Apr 28, 2025
Merged

Fix improper color opacity when using double #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7869e69
Fix color opacity applied as 8bit value
TomaszLizer Apr 27, 2025
3370335
Add tests
TomaszLizer Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/Ignite/Framework/Color.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ public struct Color: CustomStringConvertible, Equatable, Hashable, Sendable {
let intRed = Int(red * 255)
let intGreen = Int(green * 255)
let intBlue = Int(blue * 255)
let intOpacity = Int(opacity * 255)
let intOpacity = Int(opacity * 100)

self.init(red: intRed, green: intGreen, blue: intBlue, opacity: intOpacity%)
}
Expand All @@ -554,7 +554,7 @@ public struct Color: CustomStringConvertible, Equatable, Hashable, Sendable {
/// (transparent) through to 1 (opaque).
public init(white: Double, opacity: Double = 1) {
let intWhite = Int(white * 255)
let intOpacity = Int(opacity * 255)
let intOpacity = Int(opacity * 100)

self.init(red: intWhite, green: intWhite, blue: intWhite, opacity: intOpacity%)
}
Expand Down
12 changes: 12 additions & 0 deletions Tests/IgniteTesting/Types/Color.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,16 @@ struct ColorTypeTests {

#expect(color.description == "rgb(\(red) \(blue) \(green) / \(opacity.roundedValue)%)")
}

@Test("Double to Int Conversion in init(red:green:blue:opacity:)")
func rbgaInitWithDouble() {
let color = Color(red: 1.0, green: 1.0, blue: 1.0, opacity: 1.0)
#expect(color.description == "rgb(255 255 255 / 100%)")
}

@Test("Double to Int Conversion in init(white:opacity:)")
func whiteAndOpacityInitWithDouble() {
let color = Color(white: 1.0, opacity: 1.0)
#expect(color.description == "rgb(255 255 255 / 100%)")
}
}