Skip to content

Commit e751979

Browse files
Desktop: Mac fix keyboard input (#3371)
* add browser debug port env * mac use option as alt * fix cef texture double sRGB conversion by using cef-rs fork with fix * fix keyboard input on mac * add missing frontend messages * fixup * fix keyboard input mac * dbg * re implement keyboard mapping Co-authored-by: csmoe <csmoe@msn.com> * Fix double arrow keys * try fix for non mac * test * Revert "test" This reverts commit c7cde9c. * fix mac * some cleanup * fix zoom in shortcut on mac introduced in #3377 * disable menu shortcut display * fixup
1 parent 181c30b commit e751979

File tree

14 files changed

+363
-381
lines changed

14 files changed

+363
-381
lines changed

Cargo.lock

Lines changed: 8 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,9 @@ iai-callgrind = { version = "0.16" }
188188
ndarray = "0.16"
189189
strum = { version = "0.27", features = ["derive"] }
190190
dirs = "6.0"
191-
cef = { version = "141", features = ["accelerated_osr"] }
192-
cef-dll-sys = "141"
191+
# TODO: remove fork usage when https://github.com/tauri-apps/cef-rs/pull/272 is merged and published
192+
cef = { git = "https://github.com/timon-schelling/cef-rs.git", rev = "98493a182928f1ff8d5bf8b9eea61483235df75d" }
193+
cef-dll-sys = { git = "https://github.com/timon-schelling/cef-rs.git", rev = "98493a182928f1ff8d5bf8b9eea61483235df75d" }
193194
include_dir = "0.7"
194195
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
195196
tracing = "0.1"

desktop/Cargo.toml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ default = ["recommended", "embedded_resources"]
1717
recommended = ["gpu", "accelerated_paint"]
1818
embedded_resources = ["dep:graphite-desktop-embedded-resources"]
1919
gpu = ["graphite-desktop-wrapper/gpu"]
20-
21-
# Hardware acceleration features
22-
accelerated_paint = ["accelerated_paint_dmabuf", "accelerated_paint_d3d11", "accelerated_paint_iosurface"]
23-
accelerated_paint_dmabuf = ["libc", "ash"]
24-
accelerated_paint_d3d11 = ["windows", "ash"]
25-
accelerated_paint_iosurface = ["metal", "objc", "core-foundation"]
20+
accelerated_paint = ["cef/accelerated_osr"]
2621

2722
[dependencies]
2823
# Local dependencies
@@ -49,32 +44,19 @@ rand = { workspace = true, features = ["thread_rng"] }
4944
serde = { workspace = true }
5045
clap = { workspace = true, features = ["derive"] }
5146

52-
# Hardware acceleration dependencies
53-
ash = { version = "0.38", optional = true }
54-
5547
# Windows-specific dependencies
5648
[target.'cfg(target_os = "windows")'.dependencies]
5749
windows = { version = "0.58.0", features = [
5850
"Win32_Foundation",
59-
"Win32_Graphics_Direct3D11",
60-
"Win32_Graphics_Direct3D12",
61-
"Win32_Graphics_Dxgi",
62-
"Win32_Graphics_Dxgi_Common",
6351
"Win32_Graphics_Dwm",
6452
"Win32_Graphics_Gdi",
6553
"Win32_System_LibraryLoader",
6654
"Win32_UI_Controls",
6755
"Win32_UI_WindowsAndMessaging",
6856
"Win32_UI_HiDpi",
69-
], optional = true }
57+
] }
7058

7159
# macOS-specific dependencies
7260
[target.'cfg(target_os = "macos")'.dependencies]
7361
muda = { git = "https://github.com/tauri-apps/muda.git", rev = "3f460b8fbaed59cda6d95ceea6904f000f093f15", default-features = false }
74-
metal = { version = "0.31.0", optional = true }
75-
objc = { version = "0.2", optional = true }
76-
core-foundation = { version = "0.10", optional = true }
7762

78-
# Linux-specific dependencies
79-
[target.'cfg(target_os = "linux")'.dependencies]
80-
libc = { version = "0.2", optional = true }

0 commit comments

Comments
 (0)