diff --git a/Cargo.lock b/Cargo.lock index c151193..60eaa2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -445,27 +445,25 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.12.5" +version = "1.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4e8200b9a4a5801a769d50eeabc05670fec7e959a8cb7a63a93e4e519942ae" +checksum = "dabb68eb3a7aa08b46fddfd59a3d55c978243557a90ab804769f7e20e67d2b01" dependencies = [ "aws-lc-sys", - "paste", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9dd2e03ee80ca2822dd6ea431163d2ef259f2066a4d6ccaca6d9dcb386aa43" +checksum = "6bbe221bbf523b625a4dd8585c7f38166e31167ec2ca98051dbcb4c3b6e825d2" dependencies = [ "bindgen 0.69.5", "cc", "cmake", "dunce", "fs_extra", - "paste", ] [[package]] @@ -1095,7 +1093,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1422,7 +1420,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "proc-macro2", "quote", @@ -2166,7 +2164,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2243,7 +2241,7 @@ dependencies = [ "wayland-protocols", "wayland-protocols-plasma", "windows", - "windows-core 0.58.0", + "windows-core 0.60.1", "x11-clipboard", "x11rb", "xim", @@ -2253,7 +2251,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "proc-macro2", "quote", @@ -2441,9 +2439,9 @@ dependencies = [ [[package]] name = "http" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", @@ -2462,12 +2460,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", - "futures-util", + "futures-core", "http", "http-body", "pin-project-lite", @@ -2476,7 +2474,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "anyhow", "bytes", @@ -2975,9 +2973,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.170" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libfuzzer-sys" @@ -3169,7 +3167,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "anyhow", "bindgen 0.70.1", @@ -3360,7 +3358,7 @@ dependencies = [ "chacha20poly1305", "getrandom 0.2.15", "instant", - "reqwest 0.12.12", + "reqwest 0.12.13", "scrypt", "secp256k1", "serde", @@ -4278,9 +4276,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -4489,7 +4487,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "derive_refineable", ] @@ -4567,14 +4565,14 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "windows-registry", + "windows-registry 0.2.0", ] [[package]] name = "reqwest" -version = "0.12.12" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" +checksum = "389a89e494bbc88bebf30e23da98742c843863a16a352647716116aa71fae80a" dependencies = [ "base64", "bytes", @@ -4612,13 +4610,13 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "windows-registry", + "windows-registry 0.4.0", ] [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "anyhow", "bytes", @@ -4657,9 +4655,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", @@ -5011,7 +5009,7 @@ checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "anyhow", "serde", @@ -5327,7 +5325,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "arrayvec", "log", @@ -6152,7 +6150,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" +source = "git+https://github.com/zed-industries/zed#cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6" dependencies = [ "anyhow", "async-fs", @@ -6586,12 +6584,24 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.58.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529" dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", + "windows-collections", + "windows-core 0.60.1", + "windows-future", + "windows-link", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec" +dependencies = [ + "windows-core 0.60.1", ] [[package]] @@ -6605,22 +6615,32 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.58.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247" dependencies = [ "windows-implement", "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", + "windows-link", + "windows-result 0.3.1", + "windows-strings 0.3.1", +] + +[[package]] +name = "windows-future" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0" +dependencies = [ + "windows-core 0.60.1", + "windows-link", ] [[package]] name = "windows-implement" -version = "0.58.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" dependencies = [ "proc-macro2", "quote", @@ -6629,9 +6649,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.58.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01" dependencies = [ "proc-macro2", "quote", @@ -6644,17 +6664,38 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +[[package]] +name = "windows-numerics" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed" +dependencies = [ + "windows-core 0.60.1", + "windows-link", +] + [[package]] name = "windows-registry" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", - "windows-strings", + "windows-result 0.2.0", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" +dependencies = [ + "windows-result 0.3.1", + "windows-strings 0.3.1", + "windows-targets 0.53.0", +] + [[package]] name = "windows-result" version = "0.2.0" @@ -6664,16 +6705,34 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-strings" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-strings" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -6749,13 +6808,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -6774,6 +6849,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -6792,6 +6873,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -6810,12 +6897,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -6834,6 +6933,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -6852,6 +6957,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -6870,6 +6981,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -6888,6 +7005,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" version = "0.7.3" diff --git a/crates/app/src/device.rs b/crates/app/src/device.rs index ed4f4ef..d646c1d 100644 --- a/crates/app/src/device.rs +++ b/crates/app/src/device.rs @@ -39,7 +39,6 @@ pub enum DeviceState { impl DeviceState { pub fn subscribe(&self, window: &mut Window, cx: &mut Context) { - log::info!("Device State: {:?}", self); match self { Self::Master => { let client = get_client(); @@ -156,25 +155,7 @@ pub fn init(window: &mut Window, cx: &App) { cx.update(|cx| { let state = cx.new(|_| DeviceState::None); - - window_handle - .update(cx, |_, window, cx| { - // Open the onboarding view - Root::update(window, cx, |this, window, cx| { - this.replace_view(onboarding::init(window, cx).into()); - cx.notify(); - }); - - window - .observe(&state, cx, |this, window, cx| { - this.update(cx, |this, cx| { - this.subscribe(window, cx); - }); - }) - .detach(); - }) - .ok(); - + let weak_state = state.downgrade(); let requesters = cx.new(|_| HashSet::new()); let entity = cx.new(|_| Device { profile: None, @@ -192,6 +173,18 @@ pub fn init(window: &mut Window, cx: &App) { cx.notify(); }); + // Observe the DeviceState changes + if let Some(state) = weak_state.upgrade() { + window + .observe(&state, cx, |this, window, cx| { + this.update(cx, |this, cx| { + this.subscribe(window, cx); + }); + }) + .detach(); + }; + + // Observe the Device changes window .observe(&entity, cx, |this, window, cx| { this.update(cx, |this, cx| { diff --git a/crates/app/src/main.rs b/crates/app/src/main.rs index ac88abb..587d37d 100644 --- a/crates/app/src/main.rs +++ b/crates/app/src/main.rs @@ -24,12 +24,12 @@ use nostr_sdk::{ }; use smol::Timer; use std::{collections::HashSet, mem, sync::Arc, time::Duration}; -use ui::Root; +use ui::{theme::Theme, Root}; use views::startup; -mod asset; -mod device; -mod views; +pub(crate) mod asset; +pub(crate) mod device; +pub(crate) mod views; actions!(coop, [Quit]); @@ -245,6 +245,13 @@ fn main() { // Open a window with default options cx.open_window(opts, |window, cx| { + // Automatically sync theme with system appearance + window + .observe_window_appearance(|window, cx| { + Theme::sync_system_appearance(Some(window), cx); + }) + .detach(); + // Initialize components ui::init(cx); diff --git a/crates/app/src/views/relays.rs b/crates/app/src/views/relays.rs index b4b68e0..3720fe9 100644 --- a/crates/app/src/views/relays.rs +++ b/crates/app/src/views/relays.rs @@ -71,7 +71,7 @@ impl Relays { if let Ok(relays) = task.await { _ = cx.update(|cx| { _ = this.update(cx, |this: &mut Vec, cx| { - this.extend(relays); + *this = relays; cx.notify(); }); }); diff --git a/crates/global/src/constants.rs b/crates/global/src/constants.rs index f987d22..5e4d6fa 100644 --- a/crates/global/src/constants.rs +++ b/crates/global/src/constants.rs @@ -1,7 +1,6 @@ pub const APP_NAME: &str = "Coop"; pub const APP_ID: &str = "su.reya.coop"; -pub const KEYRING: &str = "Coop Safe Storage"; pub const CLIENT_KEYRING: &str = "Coop Client Keys"; pub const MASTER_KEYRING: &str = "Coop Master Keys"; diff --git a/crates/ui/src/button.rs b/crates/ui/src/button.rs index 36fb246..4a1aff1 100644 --- a/crates/ui/src/button.rs +++ b/crates/ui/src/button.rs @@ -634,7 +634,18 @@ impl ButtonVariant { _ => cx.theme().base.step(cx, ColorScaleStep::THREE), }; - let fg = cx.theme().base.step(cx, ColorScaleStep::ELEVEN); + let fg = match self { + ButtonVariant::Primary => match cx.theme().accent.name().to_string().as_str() { + "Sky" => cx.theme().base.darken(cx), + "Mint" => cx.theme().base.darken(cx), + "Lime" => cx.theme().base.darken(cx), + "Amber" => cx.theme().base.darken(cx), + "Yellow" => cx.theme().base.darken(cx), + _ => cx.theme().accent.step(cx, ColorScaleStep::ONE), + }, + _ => cx.theme().base.step(cx, ColorScaleStep::ELEVEN), + }; + let border = bg; let underline = self.underline(window, cx); let shadow = false; diff --git a/crates/ui/src/theme/scale.rs b/crates/ui/src/theme/scale.rs index c6eb97c..58ac93f 100644 --- a/crates/ui/src/theme/scale.rs +++ b/crates/ui/src/theme/scale.rs @@ -293,7 +293,10 @@ impl ColorScaleSet { } } - pub fn darken(&self, _cx: &App) -> Hsla { - self.light.step_12() + pub fn darken(&self, cx: &App) -> Hsla { + match cx.theme().appearance { + Appearance::Light => self.light.step_12(), + Appearance::Dark => self.dark.step_1(), + } } } diff --git a/crates/ui/src/title_bar.rs b/crates/ui/src/title_bar.rs index 89070ad..d435ecb 100644 --- a/crates/ui/src/title_bar.rs +++ b/crates/ui/src/title_bar.rs @@ -11,7 +11,7 @@ use gpui::{ use std::rc::Rc; const HEIGHT: Pixels = px(34.); -const TITLE_BAR_HEIGHT: Pixels = px(35.); +const TITLE_BAR_HEIGHT: Pixels = px(34.); #[cfg(target_os = "macos")] const TITLE_BAR_LEFT_PADDING: Pixels = px(80.); #[cfg(not(target_os = "macos"))]