From a7aad594095fec93241709842ba609104467e927 Mon Sep 17 00:00:00 2001 From: Elijah Kuntz Date: Mon, 2 Nov 2026 15:34:56 -0700 Subject: [PATCH 1/2] Fix washed-out SDR video and missing download artwork on macOS The video layer's float framebuffer had no colour space, so macOS read gamma-encoded SDR as linear light; SDR is now tagged sRGB (HDR keeps BT.2100 PQ). Downloaded artwork is kept in dot-files, which the asset protocol's "**" scope skips on macOS unless leading dots are allowed. Co-Authored-By: Claude Opus 5.5 --- src-tauri/src/platform/macos.rs | 17 ++++++++++++----- src-tauri/tauri.conf.json | 9 ++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src-tauri/src/platform/macos.rs b/src-tauri/src/platform/macos.rs index d9334f6..4bb331f 100644 --- a/src-tauri/src/platform/macos.rs +++ b/src-tauri/src/platform/macos.rs @@ -14,8 +14,8 @@ use std::sync::Arc; use objc2::rc::Retained; use objc2::{define_class, msg_send, AllocAnyThread, DefinedClass, MainThreadMarker}; use objc2_app_kit::{NSAutoresizingMaskOptions, NSView, NSWindow, NSWindowButton, NSWindowOrderingMode}; -use objc2_core_foundation::CFTimeInterval; -use objc2_core_graphics::{kCGColorSpaceITUR_2100_PQ, CGColorSpace}; +use objc2_core_foundation::{CFRetained, CFTimeInterval}; +use objc2_core_graphics::{kCGColorSpaceITUR_2100_PQ, kCGColorSpaceSRGB, CGColorSpace}; use objc2_core_video::CVTimeStamp; use objc2_foundation::{NSNumber, NSPoint, NSRect, NSSize, NSString}; use objc2_open_gl::*; @@ -131,6 +131,10 @@ extern "C" fn on_update(wake: *mut c_void) { let _ = wake.try_send(()); } +fn srgb() -> Option> { + CGColorSpace::with_name(Some(unsafe { kCGColorSpaceSRGB })) +} + // —— The video layer ——————————————————————————————————————————————————— struct LayerIvars { @@ -211,6 +215,9 @@ impl VideoLayer { let this = VideoLayer::alloc().set_ivars(LayerIvars { cgl, pixel_format, float, render: Mutex::new(None) }); let layer: Retained = unsafe { msg_send![super(this), init] }; layer.setAsynchronous(false); + // A float framebuffer without a colour space would be read as linear + // light, washing SDR out; mpv writes gamma-encoded SDR, as for Windows. + layer.setColorspace(srgb().as_deref()); layer.setNeedsDisplayOnBoundsChange(true); layer.setOpaque(true); layer @@ -393,7 +400,7 @@ impl VideoSurface { /// HDR passthrough: for PQ or HLG video, mpv outputs PQ (BT.2020) instead of /// tone-mapping to SDR, and the layer shows it in extended dynamic range, so - /// macOS maps it to the display's HDR headroom. SDR video uses the defaults. + /// macOS maps it to the display's HDR headroom. SDR video is shown as sRGB. pub fn on_property(&mut self, name: &str, value: &serde_json::Value) { if name != "video-params/gamma" { return; @@ -413,8 +420,8 @@ impl VideoSurface { let layer = &self.ui.layer; CATransaction::begin(); layer.setWantsExtendedDynamicRangeContent(edr); - let pq = if edr { CGColorSpace::with_name(Some(unsafe { kCGColorSpaceITUR_2100_PQ })) } else { None }; - layer.setColorspace(pq.as_deref()); + let space = if edr { CGColorSpace::with_name(Some(unsafe { kCGColorSpaceITUR_2100_PQ })) } else { srgb() }; + layer.setColorspace(space.as_deref()); CATransaction::commit(); } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 1646121..5494755 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -31,9 +31,12 @@ "csp": null, "assetProtocol": { "enable": true, - "scope": [ - "**" - ] + "scope": { + "allow": [ + "**" + ], + "requireLiteralLeadingDot": false + } } } }, From 6f92aa42cc38c11fc93002d04bf911624a701abe Mon Sep 17 00:00:00 2001 From: Elijah Kuntz Date: Mon, 2 Nov 2026 15:35:06 -0700 Subject: [PATCH 2/2] Release Kaleido Desktop 0.1.0-beta.9 Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5b0671..561793e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 0.1.0-beta.9 + +Fixes for the Mac version. + +- Regular (SDR) video no longer looks washed out on Mac; HDR was unaffected. +- Downloaded titles show their artwork again on Mac. + ## 0.1.0-beta.8 Kaleido for Mac. diff --git a/package-lock.json b/package-lock.json index 089a180..01e5262 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kaleido-desktop", - "version": "0.1.0-beta.8", + "version": "0.1.0-beta.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kaleido-desktop", - "version": "0.1.0-beta.8", + "version": "0.1.0-beta.9", "dependencies": { "@fontsource-variable/inter": "^5.3.0", "@tanstack/react-query": "^5.105.0", diff --git a/package.json b/package.json index 2e8898e..17159e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "kaleido-desktop", "private": true, - "version": "0.1.0-beta.8", + "version": "0.1.0-beta.9", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1356bb1..202e163 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "kaleido" -version = "0.1.0-beta.8" +version = "0.1.0-beta.9" dependencies = [ "fs2", "futures-util", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 3bf361e..7aaed82 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kaleido" -version = "0.1.0-beta.8" +version = "0.1.0-beta.9" description = "Kaleido — a Plex client for Windows" authors = ["Elijah"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 5494755..013bdfe 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Kaleido", - "version": "0.1.0-beta.8", + "version": "0.1.0-beta.9", "identifier": "tv.kaleido.desktop", "build": { "beforeDevCommand": "npm run dev",