Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,27 @@ inherits = "release"
lto = "thin"
codegen-units = 1
strip = "debuginfo"

# Windows scene-overlay plane (zeronsh/zui#15). Drop this patch and bump the zui
# rev above once it merges.
[patch."https://github.com/zeronsh/zui"]
collections = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
derive_refineable = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_linux = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_macos = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_macros = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_platform = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_shared_string = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_tokio = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_util = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_web = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_wgpu = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
gpui_windows = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
http_client = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
media = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
perf = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
refineable = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
scheduler = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
sum_tree = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
util_macros = { git = "https://github.com/Master0fFate/zui", rev = "6cc8c58a3cc63cce3e136f1e63d02bd66fd57ed5" }
11 changes: 11 additions & 0 deletions crates/ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ required-features = ["windows-render-fixture"]
name = "appshots-fixture"
required-features = ["appshots-fixture"]

[[example]]
name = "tool-images-fixture"
required-features = ["appshots-fixture"]

[[example]]
name = "new-project-fixture"
required-features = ["project-palette-fixture"]
Expand Down Expand Up @@ -118,4 +122,11 @@ mimalloc.workspace = true
tracing-subscriber.workspace = true

[target.'cfg(windows)'.dependencies]
# Embedded browser: WebView2 in visual-hosting mode, composited by the zui
# overlay plane. Same windows 0.61 as gpui_windows, so COM types interoperate.
webview2-com = "0.38"
windows = { version = "0.61", features = ["Win32_Foundation", "Win32_Graphics_Direct2D_Common", "Win32_Graphics_DirectComposition", "Win32_System_Com", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_WindowsAndMessaging"] }
windows-core = "0.61"
raw-window-handle = "0.6"
reqwest.workspace = true
windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_Security", "Win32_System_Threading", "Win32_UI_WindowsAndMessaging"] }
Loading
Loading