fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-24 19:58:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Desktop: Update winit to include window dragging fix for Windows (#4550)

Browse Source
This commit is contained in:
Timon
2026-09-20 01:27:37 +00:00
committed by GitHub
parent 2ed5e775e5
commit aee07b052a
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+24 -24
View File
@@ -788,7 +788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -1207,7 +1207,7 @@ dependencies = [
"libc", "libc",
"option-ext", "option-ext",
"redox_users", "redox_users",
"windows-sys 0.61.2", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -1342,7 +1342,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
[[package]] [[package]]
name = "dpi" name = "dpi"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@@ -1491,7 +1491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -1552,7 +1552,7 @@ checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"rustix", "rustix",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -2241,6 +2241,7 @@ dependencies = [
"tokio", "tokio",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"url",
"vello", "vello",
"wgpu", "wgpu",
"windows 0.62.2", "windows 0.62.2",
@@ -3973,7 +3974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -4513,7 +4514,7 @@ dependencies = [
"once_cell", "once_cell",
"socket2", "socket2",
"tracing", "tracing",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -5049,7 +5050,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -5117,7 +5118,7 @@ dependencies = [
"security-framework", "security-framework",
"security-framework-sys", "security-framework-sys",
"webpki-root-certs", "webpki-root-certs",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -5847,7 +5848,7 @@ dependencies = [
"getrandom 0.3.3", "getrandom 0.3.3",
"once_cell", "once_cell",
"rustix", "rustix",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -7135,7 +7136,7 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
dependencies = [ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -7588,7 +7589,7 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
[[package]] [[package]]
name = "winit" name = "winit"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"cfg_aliases", "cfg_aliases",
@@ -7615,7 +7616,7 @@ dependencies = [
[[package]] [[package]]
name = "winit-android" name = "winit-android"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"android-activity", "android-activity",
"bitflags 2.11.0", "bitflags 2.11.0",
@@ -7630,7 +7631,7 @@ dependencies = [
[[package]] [[package]]
name = "winit-appkit" name = "winit-appkit"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"block2", "block2",
@@ -7652,7 +7653,7 @@ dependencies = [
[[package]] [[package]]
name = "winit-common" name = "winit-common"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"block2", "block2",
"dpi 0.1.2 (git+https://github.com/timon-schelling/winit?branch=graphite)", "dpi 0.1.2 (git+https://github.com/timon-schelling/winit?branch=graphite)",
@@ -7670,7 +7671,7 @@ dependencies = [
[[package]] [[package]]
name = "winit-core" name = "winit-core"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"cursor-icon", "cursor-icon",
@@ -7679,14 +7680,13 @@ dependencies = [
"raw-window-handle", "raw-window-handle",
"serde", "serde",
"smol_str", "smol_str",
"url",
"web-time", "web-time",
] ]
[[package]] [[package]]
name = "winit-orbital" name = "winit-orbital"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"dpi 0.1.2 (git+https://github.com/timon-schelling/winit?branch=graphite)", "dpi 0.1.2 (git+https://github.com/timon-schelling/winit?branch=graphite)",
@@ -7702,7 +7702,7 @@ dependencies = [
[[package]] [[package]]
name = "winit-uikit" name = "winit-uikit"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"block2", "block2",
@@ -7723,7 +7723,7 @@ dependencies = [
[[package]] [[package]]
name = "winit-wayland" name = "winit-wayland"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"calloop", "calloop",
@@ -7750,7 +7750,7 @@ dependencies = [
[[package]] [[package]]
name = "winit-web" name = "winit-web"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"atomic-waker", "atomic-waker",
"bitflags 2.11.0", "bitflags 2.11.0",
@@ -7772,16 +7772,16 @@ dependencies = [
[[package]] [[package]]
name = "winit-win32" name = "winit-win32"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"cursor-icon", "cursor-icon",
"dpi 0.1.2 (git+https://github.com/timon-schelling/winit?branch=graphite)", "dpi 0.1.2 (git+https://github.com/timon-schelling/winit?branch=graphite)",
"percent-encoding",
"raw-window-handle", "raw-window-handle",
"smol_str", "smol_str",
"tracing", "tracing",
"unicode-segmentation", "unicode-segmentation",
"url",
"windows-sys 0.61.2", "windows-sys 0.61.2",
"winit-common", "winit-common",
"winit-core", "winit-core",
@@ -7790,7 +7790,7 @@ dependencies = [
[[package]] [[package]]
name = "winit-x11" name = "winit-x11"
version = "0.31.0-beta.3" version = "0.31.0-beta.3"
source = "git+https://github.com/timon-schelling/winit?branch=graphite#739828c05de222d0851899e4441343eb14aaf922" source = "git+https://github.com/timon-schelling/winit?branch=graphite#2bdd85391e28078d1cbb68761b13fd3332e7d2a4"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"bytemuck", "bytemuck",
desktop/Cargo.toml
+1
View File
@@ -44,6 +44,7 @@ rfd = { workspace = true }
open = { workspace = true } open = { workspace = true }
lzma-rust2 = { workspace = true } lzma-rust2 = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
url = { workspace = true }
rand = { workspace = true, features = ["thread_rng"] } rand = { workspace = true, features = ["thread_rng"] }
clap = { workspace = true, features = ["derive"] } clap = { workspace = true, features = ["derive"] }
interprocess = "2.4.2" interprocess = "2.4.2"
desktop/src/app.rs
+3 -2
View File
@@ -656,9 +656,10 @@ impl ApplicationHandler for App {
self.app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(message)); self.app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(message));
} }
}, },
WindowEvent::DataTransferReceived { serial, ref value, .. } if self.pending_dnd_fetch == Some(serial) => match value.try_as_file_paths() { WindowEvent::DataTransferReceived { serial, ref value, .. } if self.pending_dnd_fetch == Some(serial) => match value.try_as_uris() {
Ok(paths) => { Ok(uris) => {
self.pending_dnd_fetch = None; self.pending_dnd_fetch = None;
let paths = uris.iter().filter_map(|uri| url::Url::parse(uri).ok()?.to_file_path().ok());
for path in paths { for path in paths {
match fs::read(&path) { match fs::read(&path) {
Ok(content) => { Ok(content) => {