diff --git a/Cargo.lock b/Cargo.lock index ce7cb52..0d4dba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1244,7 +1244,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "gpui_util", "indexmap", @@ -1701,7 +1701,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "proc-macro2", "quote", @@ -3436,7 +3436,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "accesskit", "anyhow", @@ -3520,7 +3520,7 @@ dependencies = [ [[package]] name = "gpui-base" version = "0.5.2" -source = "git+https://github.com/longbridge/gpui-component#f43332677dd18ba2ce00f8d7d13645128da34eb0" +source = "git+https://github.com/longbridge/gpui-component#b83e4a3a950cfe28a30e4b5a73ad0dd06a821593" dependencies = [ "aho-corasick", "anyhow", @@ -3550,7 +3550,7 @@ dependencies = [ [[package]] name = "gpui-component" version = "0.5.2" -source = "git+https://github.com/longbridge/gpui-component#f43332677dd18ba2ce00f8d7d13645128da34eb0" +source = "git+https://github.com/longbridge/gpui-component#b83e4a3a950cfe28a30e4b5a73ad0dd06a821593" dependencies = [ "anyhow", "chrono", @@ -3630,7 +3630,7 @@ dependencies = [ [[package]] name = "gpui-component-assets" version = "0.5.1" -source = "git+https://github.com/longbridge/gpui-component#f43332677dd18ba2ce00f8d7d13645128da34eb0" +source = "git+https://github.com/longbridge/gpui-component#b83e4a3a950cfe28a30e4b5a73ad0dd06a821593" dependencies = [ "anyhow", "gpui", @@ -3644,7 +3644,7 @@ dependencies = [ [[package]] name = "gpui-component-macros" version = "0.5.1" -source = "git+https://github.com/longbridge/gpui-component#f43332677dd18ba2ce00f8d7d13645128da34eb0" +source = "git+https://github.com/longbridge/gpui-component#b83e4a3a950cfe28a30e4b5a73ad0dd06a821593" dependencies = [ "proc-macro2", "quote", @@ -3654,7 +3654,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "accesskit", "accesskit_unix", @@ -3706,7 +3706,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "accesskit", "accesskit_macos", @@ -3755,7 +3755,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3766,7 +3766,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "console_error_panic_hook", "gpui", @@ -3779,7 +3779,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "schemars", "serde", @@ -3789,7 +3789,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "anyhow", "log", @@ -3799,7 +3799,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "anyhow", "console_error_panic_hook", @@ -3822,7 +3822,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "anyhow", "bytemuck", @@ -3852,7 +3852,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "accesskit", "accesskit_windows", @@ -4165,7 +4165,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "anyhow", "async-compression", @@ -4185,7 +4185,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "rustls", "rustls-platform-verifier 0.5.3", @@ -5161,7 +5161,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "anyhow", "bindgen", @@ -6209,7 +6209,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "collections", "serde", @@ -6356,9 +6356,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "png" @@ -6961,7 +6961,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "derive_refineable", ] @@ -7044,7 +7044,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "anyhow", "bytes", @@ -7445,7 +7445,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "async-task", "backtrace", @@ -8168,7 +8168,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "heapless 0.9.3", "log", @@ -9517,7 +9517,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "perf", "quote", @@ -11301,7 +11301,7 @@ checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12" [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "anyhow", "chrono", @@ -11318,7 +11318,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" dependencies = [ "tracing", "tracing-subscriber", @@ -11329,7 +11329,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0ad5441b5370428eaa353a36f63c50c5448eead5" +source = "git+https://github.com/zed-industries/zed#24e25552b1259d56a6fdd7956a419ed9e8a1a25e" [[package]] name = "zune-core" diff --git a/crates/workspace/src/views/repo_detail/browser.rs b/crates/workspace/src/views/repo_detail/browser.rs index 3f55550..62468f0 100644 --- a/crates/workspace/src/views/repo_detail/browser.rs +++ b/crates/workspace/src/views/repo_detail/browser.rs @@ -298,7 +298,9 @@ impl RepoDetailView { // built-in search (Cmd/Ctrl+F) still work; editing is blocked by the // component's disabled state. Editor::new(&code.state) - .disabled(true) + .readonly(true) + .bordered(false) + .rounded_none() .h_full() .into_any_element() } diff --git a/crates/workspace/src/views/repo_detail/mod.rs b/crates/workspace/src/views/repo_detail/mod.rs index c1274cb..adf904f 100644 --- a/crates/workspace/src/views/repo_detail/mod.rs +++ b/crates/workspace/src/views/repo_detail/mod.rs @@ -12,7 +12,9 @@ use gpui::{ Render, SharedString, Size, Subscription, Task, WeakEntity, Window, div, px, size, }; use gpui_component::button::{Button, ButtonVariants, DropdownButton}; -use gpui_component::combobox::{Caret, Combobox, ComboboxEvent, ComboboxState, ComboboxTriggerCtx}; +use gpui_component::combobox::{ + Caret, Combobox, ComboboxEvent, ComboboxState, ComboboxTriggerContext, +}; use gpui_component::dock::{DockArea, DockPlacement, Panel, PanelEvent}; use gpui_component::menu::PopupMenuItem; use gpui_component::searchable_list::SearchableVec; @@ -791,7 +793,7 @@ impl RepoDetailView { /// default trigger entirely, which is the only way to show an icon /// inside the trigger label. fn render_ref_trigger( - ctx: &ComboboxTriggerCtx>, + ctx: &ComboboxTriggerContext>, icon: CustomIconName, cx: &App, ) -> AnyElement { @@ -810,16 +812,16 @@ impl RepoDetailView { .overflow_hidden() .text_ellipsis() .whitespace_nowrap() - .when(ctx.selection.is_empty(), |this| this.text_color(muted)) + .when(ctx.selection().is_empty(), |this| this.text_color(muted)) .child( - ctx.selection + ctx.selection() .first() .map(|(_, item)| item.clone()) - .or_else(|| ctx.placeholder.cloned()) + .or_else(|| ctx.placeholder().cloned()) .unwrap_or_default(), ), ) - .child(Caret::new(ctx.size).text_color(muted)) + .child(Caret::new(ctx.size()).text_color(muted)) .into_any_element() }