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 c7cde9c597.

* fix mac

* some cleanup

* fix zoom in shortcut on mac introduced in #3377

* disable menu shortcut display

* fixup
This commit is contained in:
Timon
2025-11-17 11:51:59 +00:00
committed by GitHub
parent 181c30bc0a
commit e751979e5c
14 changed files with 365 additions and 383 deletions

50
Cargo.lock generated
View File

@@ -725,14 +725,13 @@ dependencies = [
[[package]]
name = "cef"
version = "141.4.0+141.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e05b0ae455c0cf0693da242b3336586cd0057702c0516731d8ba72962559a625"
source = "git+https://github.com/timon-schelling/cef-rs.git?rev=98493a182928f1ff8d5bf8b9eea61483235df75d#98493a182928f1ff8d5bf8b9eea61483235df75d"
dependencies = [
"ash",
"cef-dll-sys",
"libc",
"libloading",
"metal 0.32.0",
"metal",
"objc",
"objc2-io-surface",
"thiserror 2.0.16",
@@ -744,9 +743,8 @@ dependencies = [
[[package]]
name = "cef-dll-sys"
version = "141.6.0+141.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c95e419bbb8b2190df8b6eb3934ecc4137533803fcc5ae2b076e591ee789071"
version = "141.4.0+141.0.9"
source = "git+https://github.com/timon-schelling/cef-rs.git?rev=98493a182928f1ff8d5bf8b9eea61483235df75d#98493a182928f1ff8d5bf8b9eea61483235df75d"
dependencies = [
"anyhow",
"cmake",
@@ -1016,17 +1014,6 @@ version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "core-graphics-types"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.4",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.2.0"
@@ -1337,8 +1324,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
[[package]]
name = "download-cef"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d98178d9254efef0f69c1f584713d69c790ec00668cd98f783a5085fbefdbddc"
source = "git+https://github.com/timon-schelling/cef-rs.git?rev=98493a182928f1ff8d5bf8b9eea61483235df75d#98493a182928f1ff8d5bf8b9eea61483235df75d"
dependencies = [
"bzip2",
"clap",
@@ -2302,22 +2288,17 @@ dependencies = [
name = "graphite-desktop"
version = "0.1.0"
dependencies = [
"ash",
"bytemuck",
"cef",
"cef-dll-sys",
"clap",
"core-foundation 0.10.1",
"derivative",
"dirs",
"futures",
"glam",
"graphite-desktop-embedded-resources",
"graphite-desktop-wrapper",
"libc",
"metal 0.31.0",
"muda",
"objc",
"open",
"rand 0.9.2",
"rfd",
@@ -3422,21 +3403,6 @@ dependencies = [
"autocfg",
]
[[package]]
name = "metal"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
dependencies = [
"bitflags 2.9.3",
"block",
"core-graphics-types 0.1.3",
"foreign-types 0.5.0",
"log",
"objc",
"paste",
]
[[package]]
name = "metal"
version = "0.32.0"
@@ -3445,7 +3411,7 @@ checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
dependencies = [
"bitflags 2.9.3",
"block",
"core-graphics-types 0.2.0",
"core-graphics-types",
"foreign-types 0.5.0",
"log",
"objc",
@@ -6893,7 +6859,7 @@ dependencies = [
"bytemuck",
"cfg-if",
"cfg_aliases",
"core-graphics-types 0.2.0",
"core-graphics-types",
"glow",
"glutin_wgl_sys",
"gpu-alloc",
@@ -6905,7 +6871,7 @@ dependencies = [
"libc",
"libloading",
"log",
"metal 0.32.0",
"metal",
"naga 27.0.3",
"ndk-sys",
"objc",