From 1b8c79bb48c424abff9b9dbe75d67b5cdcef8878 Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Wed, 2 Sep 2026 07:35:33 +0700 Subject: [PATCH] update --- Cargo.lock | 81 ++++++++++++++++--------------- crates/workspace/src/workspace.rs | 22 ++++----- 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d574fe3..a4f693c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -613,9 +613,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.18.0" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2b2dcc879c3bae0d371e77c99f2238400ef24ec001394befa67b6e543add9e" +checksum = "b281d307588d634de920874890732659e2e7672f72b5e10e81badc1a8a83621e" dependencies = [ "aws-lc-sys", "zeroize", @@ -623,9 +623,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.44.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09fae7be8bb3174e05c6afdb34199e6dc0c7c04ba9fa237b1967adfbde27483" +checksum = "9bff6c3b54fad79a2e60b8102caf565819711497c1f5f092f49508e2f5c31b27" dependencies = [ "cc", "cmake", @@ -776,7 +776,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca4c7abb40c8817d77403c880988cfd484f23ab2365726afb2f798363e2c4a2" dependencies = [ "bitcoin-io", - "hex-conservative 0.2.2", + "hex-conservative 0.2.3", ] [[package]] @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "gpui_util", "indexmap", @@ -1704,7 +1704,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "proc-macro2", "quote", @@ -3484,7 +3484,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "accesskit", "anyhow", @@ -3707,7 +3707,7 @@ dependencies = [ [[package]] name = "gpui_apple" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "anyhow", "block", @@ -3730,7 +3730,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "accesskit", "accesskit_unix", @@ -3776,7 +3776,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "accesskit", "accesskit_macos", @@ -3822,7 +3822,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3833,7 +3833,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "console_error_panic_hook", "gpui", @@ -3846,7 +3846,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "schemars", "serde", @@ -3856,7 +3856,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "anyhow", "log", @@ -3866,7 +3866,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "anyhow", "console_error_panic_hook", @@ -3890,7 +3890,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "anyhow", "bytemuck", @@ -3916,7 +3916,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "accesskit", "accesskit_windows", @@ -4131,9 +4131,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-conservative" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f" +checksum = "db3fef046dca3ca91ee1408a8c1b80ab777e80a4d308d1bf4e7adb3fcb047e08" dependencies = [ "arrayvec", ] @@ -4230,7 +4230,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "anyhow", "async-compression", @@ -4250,7 +4250,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "log", "rustls", @@ -4950,9 +4950,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7955dfc218a8afb29dfeffd540e3a6e96baeb94fe7138228dd7cc6937fbbf96" +checksum = "8d8f1ea3f21fd3405dcaf6c9b5c1630af9afc422d9073ea39c5f6d6c772e08ed" dependencies = [ "libc", ] @@ -5206,7 +5206,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "anyhow", "bindgen", @@ -6264,7 +6264,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "collections", "serde", @@ -7052,7 +7052,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "derive_refineable", ] @@ -7135,7 +7135,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "anyhow", "bytes", @@ -7513,7 +7513,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "async-task", "backtrace", @@ -8227,7 +8227,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "heapless 0.9.3", "log", @@ -9625,7 +9625,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "perf", "quote", @@ -9671,9 +9671,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "value-bag" -version = "1.13.2" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068e763e8279de7ab94b6afebded2cb701678af094feb1c12ccb061b4783c1be" +checksum = "2799ffb329a792ecfd902b71306c8a815a6ef1c0470fa9953a6aa4d4cecbe511" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -9681,9 +9681,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27780e3aec98b13ac796bc0d5770205ee6e976d1ccb33a52da70b73ff0ff880d" +checksum = "0941feceafbe7a8f59ea1096d45b97002884a41306315ad797b3684b63a81d8c" dependencies = [ "erased-serde", "serde_core", @@ -9692,9 +9692,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c093d229c7ead9974b640e61170976e0eff3dac447cf6792c645f0b7f28b3de" +checksum = "839752af8179287d27eb2b94164641b1ede9e60ab7424163388dc21ebd0508cd" dependencies = [ "sval", "sval_buffer", @@ -9867,6 +9867,7 @@ checksum = "38a91b4eaddff87b1cd1074985e3713da4af2c49742d1b356b2c01670a67a078" dependencies = [ "cc", "downcast-rs", + "log", "rustix", "scoped-tls", "smallvec", @@ -11393,7 +11394,7 @@ checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12" [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "anyhow", "chrono", @@ -11410,7 +11411,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" dependencies = [ "tracing", "tracing-subscriber", @@ -11421,7 +11422,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#f8c278352fcc4289de66db79b599c98c1a57d351" +source = "git+https://github.com/zed-industries/zed#2551721adb5b5187bc27cfae0fbe47f0ed4c5397" [[package]] name = "zune-core" diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 78ec7e1..3f63701 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -4,20 +4,17 @@ use gpui::{Context, Entity, KeyBinding, Render, Subscription, Window, actions, d use gpui_component::{Root, StyledExt, Theme}; use gpui_fps::{FpsMonitor, FpsOverlay}; use signed_state::{Backend, BackendEvent}; -use signed_ui::image_cache::{MAX_IMAGES, image_cache}; use crate::views::SidebarPanel; use crate::views::sidebar::passphrase_dialog; -actions!(workspace, [ToggleFps]); +actions!(workspace, [ToggleMonitor]); -/// Root view of the app: dock area (whose center tab bar doubles as the -/// window title bar), overlays. pub struct Workspace { dock: Entity, - /// Debug HUD, toggled with `cmd-alt-f`. - show_fps: bool, fps: Entity, + /// Debug HUD, toggled with `cmd-shift-f`. + show_fps: bool, _subscriptions: Vec, _passphrase_subscription: Subscription, } @@ -25,7 +22,7 @@ pub struct Workspace { impl Workspace { pub fn new(window: &mut Window, cx: &mut Context) -> Self { let fps = cx.new(|cx| FpsMonitor::new(window, cx).continuous(false)); - cx.bind_keys([KeyBinding::new("cmd-alt-f", ToggleFps, None)]); + cx.bind_keys([KeyBinding::new("cmd-shift-f", ToggleMonitor, None)]); let dock = cx.new(|cx| { let skin = SignedDockSkin::new(cx); @@ -123,15 +120,16 @@ impl Render for Workspace { let notification_layer = Root::render_notification_layer(window, cx); div() - .image_cache(image_cache("workspace", MAX_IMAGES)) .id("workspace") + .on_action( + cx.listener(|this: &mut Self, _ev: &ToggleMonitor, _window, cx| { + this.show_fps = !this.show_fps; + cx.notify(); + }), + ) .v_flex() .size_full() .relative() - .on_action(cx.listener(|this: &mut Self, _: &ToggleFps, _, cx| { - this.show_fps = !this.show_fps; - cx.notify(); - })) .child(self.dock.clone()) // Notifications .children(notification_layer)