dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Bump gpui & wireup Keystroke changes (#1176)

Browse source
This commit is contained in:
Floyd Wang 2025-08-27 17:44:10 +08:00 committed by GitHub
parent 5b6f2dc26e
commit 2a652dcc01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -709,7 +709,7 @@ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.11.0", "itertools 0.12.1",
"lazy_static", "lazy_static",
"lazycell", "lazycell",
"log", "log",
@ -732,7 +732,7 @@ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.11.0", "itertools 0.13.0",
"log", "log",
"prettyplease", "prettyplease",
"proc-macro2", "proc-macro2",
@ -1401,7 +1401,7 @@ dependencies = [
[[package]] [[package]]
name = "collections" name = "collections"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"indexmap 2.10.0", "indexmap 2.10.0",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
@ -1870,7 +1870,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.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3058,7 +3058,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui" name = "gpui"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"as-raw-xcb-connection", "as-raw-xcb-connection",
@ -3243,7 +3243,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.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
@ -3512,7 +3512,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.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -3532,7 +3532,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.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"rustls", "rustls",
"rustls-platform-verifier", "rustls-platform-verifier",
@ -4486,7 +4486,7 @@ dependencies = [
[[package]] [[package]]
name = "media" name = "media"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bindgen 0.71.1", "bindgen 0.71.1",
@ -6400,7 +6400,7 @@ dependencies = [
[[package]] [[package]]
name = "refineable" name = "refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"derive_refineable", "derive_refineable",
"workspace-hack", "workspace-hack",
@ -6553,7 +6553,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.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -7130,7 +7130,7 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
[[package]] [[package]]
name = "semantic_version" name = "semantic_version"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -7753,7 +7753,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.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"log", "log",
@ -9063,7 +9063,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]] [[package]]
name = "util" name = "util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-fs 2.1.3", "async-fs 2.1.3",

6
crates/ui/src/kbd.rs
View file

@ -1,6 +1,6 @@
use gpui::{ use gpui::{
div, relative, Action, IntoElement, KeyContext, Keystroke, ParentElement as _, RenderOnce, div, relative, Action, AsKeystroke, IntoElement, KeyContext, Keystroke, ParentElement as _,
StyleRefinement, Styled, Window, RenderOnce, StyleRefinement, Styled, Window,
}; };
use crate::{ActiveTheme, StyledExt}; use crate::{ActiveTheme, StyledExt};
@ -52,7 +52,7 @@ impl Kbd {
bindings.first().and_then(|binding| { bindings.first().and_then(|binding| {
if let Some(key) = binding.keystrokes().first() { if let Some(key) = binding.keystrokes().first() {
Some(Self::new(key.clone())) Some(Self::new(key.as_keystroke().clone()))
} else { } else {
None None
} }

4
crates/ui/src/menu/popup_menu.rs
View file

@ -12,7 +12,7 @@ use gpui::{
InteractiveElement, IntoElement, KeyBinding, ParentElement, Pixels, Render, ScrollHandle, InteractiveElement, IntoElement, KeyBinding, ParentElement, Pixels, Render, ScrollHandle,
SharedString, StatefulInteractiveElement, Styled, WeakEntity, Window, SharedString, StatefulInteractiveElement, Styled, WeakEntity, Window,
}; };
use gpui::{MouseDownEvent, Subscription}; use gpui::{AsKeystroke, MouseDownEvent, Subscription};
use std::ops::Deref; use std::ops::Deref;
use std::rc::Rc; use std::rc::Rc;
@ -634,7 +634,7 @@ impl PopupMenu {
key_binding key_binding
.keystrokes() .keystrokes()
.into_iter() .into_iter()
.map(|key| Kbd::format(key)), .map(|key| Kbd::format(key.as_keystroke())),
); );
return Some(el); return Some(el);