Fix crash handler disable env

zng-ui · Jul 8, 2024 · fa97c04 · fa97c04
1 parent ee29754
commit fa97c04
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -202,6 +202,6 @@
         "zng"
     ],
     "lldb.launch.env": {
-        "NO_ZNG_CRASH_HANDLER": ""
+        "ZNG_NO_CRASH_HANDLER": ""
     }
 }
diff --git a/crates/cargo-zng/src/l10n.rs b/crates/cargo-zng/src/l10n.rs
@@ -69,8 +69,6 @@ pub struct L10nArgs {
     check: bool,
 }
 
-// !!: TODO internal crates
-
 pub fn run(mut args: L10nArgs) {
     if !args.package.is_empty() && !args.manifest_path.is_empty() {
         fatal!("only one of --package --manifest-path must be set")

diff --git a/crates/zng-view/Cargo.toml b/crates/zng-view/Cargo.toml
@@ -135,17 +135,11 @@ tempfile = "3.10"
 
 [target.'cfg(target_os = "macos")'.dependencies.objc2-app-kit]
 version = "0.2.2"
-features = [
-    "NSEvent",
-    "NSAppearance",
-    "NSColor",
-]
+features = ["NSEvent", "NSAppearance", "NSColor", "NSColorSpace"]
 [target.'cfg(target_os = "macos")'.dependencies.objc2-foundation]
 version = "0.2.2"
 features = ["NSString"]
 
-
-
 [build-dependencies]
 zng-tp-licenses = { path = "../zng-tp-licenses", version = "0.2.7", features = [
     "build",

diff --git a/crates/zng-view/src/config/macos.rs b/crates/zng-view/src/config/macos.rs
@@ -54,9 +54,13 @@ pub fn colors_config() -> ColorsConfig {
 
     let accent = unsafe {
         let a = NSColor::controlAccentColor();
-        Rgba::new(a.redComponent(), a.greenComponent(), a.blueComponent(), a.alphaComponent())
+        if let Some(a) = a.colorUsingColorSpace(&NSColorSpace::deviceRGBColorSpace()) {
+            Rgba::new(a.redComponent(), a.greenComponent(), a.blueComponent(), a.alphaComponent())
+        } else {
+            tracing::warn!("failed to determine macOS accent color");
+            ColorsConfig::default().accent
+        }
     };
-
     ColorsConfig { scheme, accent }
 }
 

diff --git a/crates/zng/src/app.rs b/crates/zng/src/app.rs
@@ -538,7 +538,7 @@ pub use zng_ext_single_instance::{AppInstanceArgs, APP_INSTANCE_EVENT};
 ///
 /// ```json
 /// "lldb.launch.env": {
-///    "NO_ZNG_CRASH_HANDLER": ""
+///    "ZNG_NO_CRASH_HANDLER": ""
 /// }
 /// ```
 ///

diff --git a/examples/headless/src/main.rs b/examples/headless/src/main.rs
@@ -12,3 +12,6 @@ fn main() {
         _ => headless::run(),
     }
 }
+
+// let the caller or OS handle crashes (can also build without "crash_handler" default feature)
+zng::app::crash_handler::crash_handler_config!(|cfg| cfg.no_crash_handler());
diff --git a/tests/render-tests/src/main.rs b/tests/render-tests/src/main.rs
@@ -26,10 +26,9 @@ fn main() {
         std::process::exit(101);
     });
 
-    zng::env::init!();
-
     let args = Args::parse();
     if let Ok(vp) = env::var("RENDER_TESTS_VP") {
+        zng::env::init!();
         return run(args, vp.into());
     }
 
@@ -39,6 +38,7 @@ fn main() {
         if args.include_vp(&view_process) {
             let result = std::process::Command::new(std::env::current_exe().unwrap())
                 .env("ZNG_VIEW_NO_INIT_START", "")
+                .env("ZNG_NO_CRASH_HANDLER", "")
                 .env("RENDER_TESTS_VP", view_process)
                 .args(std::env::args().skip(1))
                 // .env("RUST_BACKTRACE", "1")