Fix white background on Windows/Linux

probablykasper · Jul 23, 2022 · 515a8bc · 515a8bc
1 parent 8eb4b5c
commit 515a8bc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -29,8 +29,7 @@ atomicwrites = "0.3"
 macos-app-nap = "0.0.1"
 cocoa = "0.24.0"
 objc = "0.2.7"
-# https://github.com/h4llow3En/mac-notification-sys/issues/43
-mac-notification-sys = "=0.5.2"
+mac-notification-sys = "0.5.5"
 
 [features]
 default = [ "custom-protocol" ]

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -193,11 +193,13 @@ fn create_window(app: &AppHandle) -> Window {
     .title("Remind Me Again")
     .inner_size(400.0, 550.0)
     .min_inner_size(400.0, 200.0)
-    .skip_taskbar(true)
     .visible(false) // tauri_plugin_window_state reveals window
-    .transparent(true)
-    .build()
-    .expect("Unable to create window");
+    .skip_taskbar(true);
+
+  #[cfg(target_os = "macos")]
+  let win = win.transparent(true);
+
+  let win = win.build().expect("Unable to create window");
 
   #[cfg(target_os = "macos")]
   {
@@ -231,10 +233,7 @@ fn create_window(app: &AppHandle) -> Window {
       // set window background color
       let bg_color = cocoa::appkit::NSColor::colorWithRed_green_blue_alpha_(
         cocoa::base::nil,
-        // 34.0 / 255.0 * 0.5,
-        // 38.0 / 255.0 * 0.5,
-        // 45.5 / 255.0 * 0.5,
-        // 1.0,
+        // also used in App.svelte
         8.0 / 255.0,
         9.0 / 255.0,
         13.0 / 255.0,

diff --git a/src/App.svelte b/src/App.svelte
@@ -101,4 +101,5 @@
     font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji
     font-size: 18px
     color: #ffffff
+    background-color: rgb(8, 9, 13) // also used in main.rs
 </style>