Elgato_dark/Neon-Vision-Editor
1
0
Fork 0
mirror of https://github.com/h3pdesign/Neon-Vision-Editor synced 2026-04-21 13:27:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix custom theme opacity persistence on iOS

Browse source
This commit is contained in:
h3p 2026-03-15 12:51:41 +01:00
parent 7d5afefd91
commit e62b68c7cf
3 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Neon Vision Editor.xcodeproj/project.pbxproj
View file

@ -361,7 +361,7 @@
CODE_SIGNING_ALLOWED = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 514;
CURRENT_PROJECT_VERSION = 515;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = CS727NF72U;
ENABLE_APP_SANDBOX = YES;
@ -444,7 +444,7 @@
CODE_SIGNING_ALLOWED = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 514;
CURRENT_PROJECT_VERSION = 515;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = CS727NF72U;
ENABLE_APP_SANDBOX = YES;

2
Neon Vision Editor/UI/NeonSettingsView.swift
View file

@ -2160,7 +2160,7 @@ struct NeonSettingsView: View {
HStack {
Text(title)
.frame(width: isCompactSettingsLayout ? nil : standardLabelWidth, alignment: .leading)
ColorPicker("", selection: color)
ColorPicker("", selection: color, supportsOpacity: true)
.labelsHidden()
Spacer()
}

26
Neon Vision Editor/UI/ThemeSettings.swift
View file

@ -48,6 +48,7 @@ private struct RGBColorComponents {
let red: Double
let green: Double
let blue: Double
let alpha: Double
}
private func colorComponents(_ color: Color) -> RGBColorComponents? {
@ -57,7 +58,8 @@ private func colorComponents(_ color: Color) -> RGBColorComponents? {
return RGBColorComponents(
red: Double(srgb.redComponent),
green: Double(srgb.greenComponent),
blue: Double(srgb.blueComponent)
blue: Double(srgb.blueComponent),
alpha: Double(srgb.alphaComponent)
)
#else
let platform = PlatformColor(color)
@ -66,7 +68,7 @@ private func colorComponents(_ color: Color) -> RGBColorComponents? {
var blue: CGFloat = 0
var alpha: CGFloat = 0
guard platform.getRed(&red, green: &green, blue: &blue, alpha: &alpha) else { return nil }
return RGBColorComponents(red: Double(red), green: Double(green), blue: Double(blue))
return RGBColorComponents(red: Double(red), green: Double(green), blue: Double(blue), alpha: Double(alpha))
#endif
}
@ -82,7 +84,8 @@ private func blend(_ source: Color, with target: Color, amount: Double) -> Color
return Color(
red: sourceComponents.red + ((targetComponents.red - sourceComponents.red) * clamped),
green: sourceComponents.green + ((targetComponents.green - sourceComponents.green) * clamped),
blue: sourceComponents.blue + ((targetComponents.blue - sourceComponents.blue) * clamped)
blue: sourceComponents.blue + ((targetComponents.blue - sourceComponents.blue) * clamped),
opacity: sourceComponents.alpha + ((targetComponents.alpha - sourceComponents.alpha) * clamped)
)
}
@ -703,7 +706,14 @@ func currentEditorTheme(colorScheme: ColorScheme) -> EditorTheme {
func colorFromHex(_ hex: String, fallback: Color) -> Color {
let cleaned = hex.trimmingCharacters(in: .whitespacesAndNewlines).replacingOccurrences(of: "#", with: "")
guard cleaned.count == 6, let intVal = Int(cleaned, radix: 16) else { return fallback }
guard (cleaned.count == 6 || cleaned.count == 8), let intVal = UInt64(cleaned, radix: 16) else { return fallback }
if cleaned.count == 8 {
let r = Double((intVal >> 24) & 0xFF) / 255.0
let g = Double((intVal >> 16) & 0xFF) / 255.0
let b = Double((intVal >> 8) & 0xFF) / 255.0
let a = Double(intVal & 0xFF) / 255.0
return Color(red: r, green: g, blue: b, opacity: a)
}
let r = Double((intVal >> 16) & 0xFF) / 255.0
let g = Double((intVal >> 8) & 0xFF) / 255.0
let b = Double(intVal & 0xFF) / 255.0
@ -717,6 +727,7 @@ func colorToHex(_ color: Color) -> String {
let r = Int(round(srgb.redComponent * 255))
let g = Int(round(srgb.greenComponent * 255))
let b = Int(round(srgb.blueComponent * 255))
let a = Int(round(srgb.alphaComponent * 255))
#else
let platform = PlatformColor(color)
var r: CGFloat = 0
@ -727,10 +738,17 @@ func colorToHex(_ color: Color) -> String {
let rInt = Int(round(r * 255))
let gInt = Int(round(g * 255))
let bInt = Int(round(b * 255))
let aInt = Int(round(a * 255))
#endif
#if os(macOS)
if a < 255 {
return String(format: "#%02X%02X%02X%02X", r, g, b, a)
}
return String(format: "#%02X%02X%02X", r, g, b)
#else
if aInt < 255 {
return String(format: "#%02X%02X%02X%02X", rInt, gInt, bInt, aInt)
}
return String(format: "#%02X%02X%02X", rInt, gInt, bInt)
#endif
}