redesign sidebar

2023-08-01 14:26:16 +07:00
parent 9941305998
commit e97d0281e2
22 changed files with 310 additions and 200 deletions
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -182,7 +182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854"
 dependencies = [
 "clipboard-win",
- "core-graphics",
+ "core-graphics 0.22.3",
 "image",
 "log",
 "objc",
@@ -787,8 +787,24 @@ dependencies = [
 "block",
 "cocoa-foundation",
 "core-foundation",
- "core-graphics",
- "foreign-types",
+ "core-graphics 0.22.3",
+ "foreign-types 0.3.2",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation",
+ "core-foundation",
+ "core-graphics 0.23.1",
+ "foreign-types 0.5.0",
 "libc",
 "objc",
 ]
@@ -803,7 +819,7 @@ dependencies = [
 "block",
 "core-foundation",
 "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
 "libc",
 "objc",
 ]
@@ -901,7 +917,20 @@ dependencies = [
 "bitflags 1.3.2",
 "core-foundation",
 "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
 "libc",
 ]

@@ -1465,7 +1494,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
 ]

 [[package]]
@@ -1474,6 +1524,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"

+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@@ -2562,7 +2618,7 @@ dependencies = [
 name = "lume"
 version = "1.1.1"
 dependencies = [
- "cocoa",
+ "cocoa 0.24.1",
 "objc",
 "rand 0.8.5",
 "rust-argon2",
@@ -2587,6 +2643,8 @@ dependencies = [
 "tauri-plugin-updater",
 "tauri-plugin-upload",
 "tauri-plugin-window",
+ "window-shadows",
+ "window-vibrancy",
 ]

 [[package]]
@@ -4652,9 +4710,9 @@ dependencies = [
 "bitflags 1.3.2",
 "cairo-rs",
 "cc",
- "cocoa",
+ "cocoa 0.24.1",
 "core-foundation",
- "core-graphics",
+ "core-graphics 0.22.3",
 "crossbeam-channel",
 "dirs-next",
 "dispatch",
@@ -4728,7 +4786,7 @@ checksum = "2e18377a75e314aa1d476896af881ed63f57a78ca84889fe63e69067f0de158d"
 dependencies = [
 "anyhow",
 "bytes",
- "cocoa",
+ "cocoa 0.24.1",
 "dirs-next",
 "embed_plist",
 "futures-util",
@@ -5091,7 +5149,7 @@ version = "0.13.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1231be42085f3a8b150e615601f8a070bd16bf579771a5dafe2931970a05b518"
 dependencies = [
- "cocoa",
+ "cocoa 0.24.1",
 "gtk",
 "jni",
 "percent-encoding",
@@ -5857,6 +5915,28 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "window-shadows"
+version = "0.2.1"
+source = "git+https://github.com/tauri-apps/window-shadows?branch=dev#dd8ca283fa50b1484043e686fa0b1e45ba5a969d"
+dependencies = [
+ "cocoa 0.25.0",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "window-vibrancy"
+version = "0.4.0"
+source = "git+https://github.com/tauri-apps/window-vibrancy?branch=dev#d1b349f3c3f524ffd3ba37b64349ec6ad6410272"
+dependencies = [
+ "cocoa 0.25.0",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "windows"
 version = "0.36.1"
@@ -6175,8 +6255,8 @@ checksum = "7d15f9f827d537cefe6d047be3930f5d89b238dfb85e08ba6a319153217635aa"
 dependencies = [
 "base64 0.13.1",
 "block",
- "cocoa",
- "core-graphics",
+ "cocoa 0.24.1",
+ "core-graphics 0.22.3",
 "crossbeam-channel",
 "dunce",
 "gdk",
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -16,7 +16,7 @@ tauri-build = { version = "2.0.0-alpha.6", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "2.0.0-alpha.10", features = ["system-tray"] }
+tauri = { version = "2.0.0-alpha.10", features = [ "macos-private-api", "system-tray"] }
 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
@@ -32,6 +32,8 @@ tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace"
 tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-window = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+window-shadows = { git = "https://github.com/tauri-apps/window-shadows", branch = "dev" }
+window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy", branch = "dev" }
 sqlx-cli = { version = "0.7.0", default-features = false, features = [
  "sqlite",
 ] }
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -7,6 +7,8 @@
 use tauri::{Manager};
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_sql::{Migration, MigrationKind};
+use window_shadows::set_shadow;
+use window_vibrancy::{apply_blur, apply_vibrancy, NSVisualEffectMaterial};

 #[derive(Clone, serde::Serialize)]
 struct Payload {
@@ -136,6 +138,22 @@ fn main() {
    .plugin(tauri_plugin_os::init())
    .plugin(tauri_plugin_window::init())
    .plugin(tauri_plugin_store::Builder::default().build())
+    .setup(|app| {
+      let window = app.get_window("main").unwrap();
+      
+      // native shadow
+      set_shadow(&window, true).expect("Unsupported platform!");
+
+      #[cfg(target_os = "macos")]
+      apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None)
+        .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS");
+
+      #[cfg(target_os = "windows")]
+      apply_blur(&window, Some((18, 18, 18, 125)))
+        .expect("Unsupported platform! 'apply_blur' is only supported on Windows");
+
+      Ok(())
+    })
    .run(tauri::generate_context!())
    .expect("error while running tauri application");
 }
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -103,10 +103,11 @@
        "theme": "Dark",
        "title": "Lume",
        "titleBarStyle": "Overlay",
-        "transparent": false,
+        "transparent": true,
        "width": 1080,
        "center": true
      }
-    ]
+    ],
+    "macOSPrivateApi": true
  }
 }