From cd6ec193004d413f518b160a9274d4bdf9e7d9f4 Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Sat, 27 Apr 2024 15:41:14 +0200
Subject: [PATCH] Don't set the background color when initializing with
 transparency (#3657)

Setting the background color changes how the window title bar appears,
which is something that the application should customize itself if it
wants this behaviour (and also, it wasn't set when calling
`set_transparent`, so the behaviour wasn't consistent).
---
 Cargo.toml                                 | 1 -
 src/changelog/unreleased.md                | 1 +
 src/platform_impl/macos/window_delegate.rs | 3 +--
 src/window.rs                              | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a2b1f4d84b..7a70c5721e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -137,7 +137,6 @@ features = [
     "NSApplication",
     "NSBitmapImageRep",
     "NSButton",
-    "NSColor",
     "NSControl",
     "NSCursor",
     "NSDragging",
diff --git a/src/changelog/unreleased.md b/src/changelog/unreleased.md
index bf13c588c7..7607dfdcb8 100644
--- a/src/changelog/unreleased.md
+++ b/src/changelog/unreleased.md
@@ -260,3 +260,4 @@ changelog entry.
 - On Wayland, fix decoration glitch on close with some compositors.
 - On Android, fix a regression introduced in #2748 to allow volume key events to be received again.
 - On Windows, don't return a valid window handle outside of the GUI thread.
+- On macOS, don't set the background color when initializing a window with transparency.
diff --git a/src/platform_impl/macos/window_delegate.rs b/src/platform_impl/macos/window_delegate.rs
index 7e48df075f..b9e51a01ab 100644
--- a/src/platform_impl/macos/window_delegate.rs
+++ b/src/platform_impl/macos/window_delegate.rs
@@ -12,7 +12,7 @@ use objc2::{
 };
 use objc2_app_kit::{
     NSAppKitVersionNumber, NSAppKitVersionNumber10_12, NSAppearance, NSApplication,
-    NSApplicationPresentationOptions, NSBackingStoreType, NSColor, NSDraggingDestination,
+    NSApplicationPresentationOptions, NSBackingStoreType, NSDraggingDestination,
     NSFilenamesPboardType, NSPasteboard, NSRequestUserAttentionType, NSScreen, NSView,
     NSWindowButton, NSWindowDelegate, NSWindowFullScreenButton, NSWindowLevel,
     NSWindowOcclusionState, NSWindowOrderingMode, NSWindowSharingType, NSWindowStyleMask,
@@ -605,7 +605,6 @@ fn new_window(attrs: &WindowAttributes, mtm: MainThreadMarker) -> Option<Id<Wini
 
         if attrs.transparent {
             window.setOpaque(false);
-            window.setBackgroundColor(Some(unsafe { &NSColor::clearColor() }));
         }
 
         // register for drag and drop operations.
diff --git a/src/window.rs b/src/window.rs
index 0a3ede02d2..a8888c9f75 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -941,6 +941,8 @@ impl Window {
     ///
     /// ## Platform-specific
     ///
+    /// - **macOS:** If you're not drawing to the window yourself, you might have to set the
+    ///   background color of the window to enable transparency.
     /// - **Web / iOS / Android:** Unsupported.
     /// - **X11:** Can only be set while building the window, with
     ///   [`WindowAttributes::with_transparent`].