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

linux: Fix #104 Linux platform crash with BorrowMutError. (#367)

Browse source 
![Screenshot from 2024-10-19
01-20-24](https://github.com/user-attachments/assets/cc0d2250-38ae-4381-a06c-c64ec309ee4c)
This commit is contained in:
Jason Lee 2024-10-19 01:21:31 +08:00 committed by GitHub
parent 6ea9e69b98
commit 2c979c32c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Cargo.lock generated
View file

@ -474,7 +474,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.11.0", "itertools 0.13.0",
"log", "log",
"prettyplease", "prettyplease",
"proc-macro2", "proc-macro2",
@ -947,7 +947,7 @@ dependencies = [
[[package]] [[package]]
name = "collections" name = "collections"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"rustc-hash", "rustc-hash",
] ]
@ -1282,7 +1282,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_refineable" name = "derive_refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2223,7 +2223,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui" name = "gpui"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"as-raw-xcb-connection", "as-raw-xcb-connection",
@ -2322,7 +2322,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_macros" name = "gpui_macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2506,7 +2506,7 @@ dependencies = [
[[package]] [[package]]
name = "http_client" name = "http_client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -3023,7 +3023,7 @@ dependencies = [
[[package]] [[package]]
name = "media" name = "media"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bindgen", "bindgen",
@ -4288,7 +4288,7 @@ dependencies = [
[[package]] [[package]]
name = "refineable" name = "refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"derive_refineable", "derive_refineable",
] ]
@ -4591,7 +4591,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
[[package]] [[package]]
name = "semantic_version" name = "semantic_version"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -5008,7 +5008,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]] [[package]]
name = "sum_tree" name = "sum_tree"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"log", "log",
@ -5616,7 +5616,7 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]] [[package]]
name = "util" name = "util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-fs 1.6.0", "async-fs 1.6.0",
@ -6354,9 +6354,9 @@ dependencies = [
[[package]] [[package]]
name = "wry" name = "wry"
version = "0.46.1" version = "0.46.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f8c948dc5f7c23bd93ba03b85b7f679852589bb78e150424d993171e4ef7b73" checksum = "6fa1c8c760041c64ce6be99f83d6cb55fe3fcd85a1ad46d32895f6e65cee87ba"
dependencies = [ dependencies = [
"base64", "base64",
"block2", "block2",

3
crates/app/src/story_workspace.rs
View file

@ -55,6 +55,9 @@ struct DockAreaTab {
impl StoryWorkspace { impl StoryWorkspace {
pub fn new(_app_state: Arc<AppState>, cx: &mut ViewContext<Self>) -> Self { pub fn new(_app_state: Arc<AppState>, cx: &mut ViewContext<Self>) -> Self {
// There will crash on Linux.
// https://github.com/longbridgeapp/gpui-component/issues/104
#[cfg(not(target_os = "linux"))]
cx.observe_window_appearance(|_, cx| { cx.observe_window_appearance(|_, cx| {
Theme::sync_system_appearance(cx); Theme::sync_system_appearance(cx);
}) })