reya/signed
1
0
Fork 0
Code Issues Pull Requests Actions 5 Releases Activity

update gpui component

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