1
0
Fork 0

Update dependencies, allow resizing on Win/macOS

This was implemented for Linux in March, but it should now also work on
Windows and macOS.
This commit is contained in:
Robbert van der Helm 2022-12-01 20:21:56 +01:00
parent 50fa1008c0
commit ec34e54bfe
2 changed files with 60 additions and 74 deletions

122
Cargo.lock generated
View file

@ -157,11 +157,11 @@ dependencies = [
[[package]]
name = "async-channel"
version = "1.7.1"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
dependencies = [
"concurrent-queue 1.2.4",
"concurrent-queue",
"event-listener",
"futures-core",
]
@ -174,7 +174,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
dependencies = [
"async-lock",
"async-task",
"concurrent-queue 2.0.0",
"concurrent-queue",
"fastrand",
"futures-lite",
"slab",
@ -209,13 +209,13 @@ dependencies = [
[[package]]
name = "async-io"
version = "1.10.0"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7"
checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
dependencies = [
"async-lock",
"autocfg",
"concurrent-queue 1.2.4",
"concurrent-queue",
"futures-lite",
"libc",
"log",
@ -224,7 +224,7 @@ dependencies = [
"slab",
"socket2",
"waker-fn",
"winapi",
"windows-sys 0.42.0",
]
[[package]]
@ -251,20 +251,20 @@ dependencies = [
[[package]]
name = "async-process"
version = "1.5.0"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4"
dependencies = [
"async-io",
"async-lock",
"autocfg",
"blocking",
"cfg-if 1.0.0",
"event-listener",
"futures-lite",
"libc",
"once_cell",
"signal-hook",
"winapi",
"windows-sys 0.42.0",
]
[[package]]
@ -383,7 +383,7 @@ dependencies = [
[[package]]
name = "baseview"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/baseview.git?branch=feature/resize#edec855497705fbc1fbfb2c813cc1da9361f4507"
source = "git+https://github.com/robbert-vdh/baseview.git?branch=feature/resize#a9b50dc3b8077307528879928c1634fa515850ea"
dependencies = [
"cocoa",
"core-foundation",
@ -465,16 +465,16 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "blocking"
version = "1.2.0"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8"
dependencies = [
"async-channel",
"async-lock",
"async-task",
"atomic-waker",
"fastrand",
"futures-lite",
"once_cell",
]
[[package]]
@ -724,15 +724,6 @@ dependencies = [
"memchr",
]
[[package]]
name = "concurrent-queue"
version = "1.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
dependencies = [
"cache-padded",
]
[[package]]
name = "concurrent-queue"
version = "2.0.0"
@ -1309,12 +1300,12 @@ dependencies = [
[[package]]
name = "flate2"
version = "1.0.24"
version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
dependencies = [
"crc32fast",
"miniz_oxide 0.5.4",
"miniz_oxide 0.6.2",
]
[[package]]
@ -1674,9 +1665,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "gloo-timers"
version = "0.2.4"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
checksum = "98c4a8d6391675c6b2ee1a6c8d06e8e2d03605c44cec1270675985a4c2a5500b"
dependencies = [
"futures-channel",
"futures-core",
@ -2556,7 +2547,7 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [
"bitflags",
"jni-sys",
"ndk-sys 0.4.0",
"ndk-sys 0.4.1+23.1.7779620",
"num_enum",
"raw-window-handle 0.5.0",
"thiserror",
@ -2579,7 +2570,7 @@ dependencies = [
"ndk 0.7.0",
"ndk-context",
"ndk-macro",
"ndk-sys 0.4.0",
"ndk-sys 0.4.1+23.1.7779620",
"once_cell",
"parking_lot 0.12.1",
]
@ -2608,9 +2599,9 @@ dependencies = [
[[package]]
name = "ndk-sys"
version = "0.4.0"
version = "0.4.1+23.1.7779620"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21d83ec9c63ec5bf950200a8e508bdad6659972187b625469f58ef8c08e29046"
checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
dependencies = [
"jni-sys",
]
@ -3087,7 +3078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
"parking_lot_core 0.9.4",
"parking_lot_core 0.9.5",
]
[[package]]
@ -3106,9 +3097,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
dependencies = [
"cfg-if 1.0.0",
"libc",
@ -3156,9 +3147,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "pest"
version = "2.4.1"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8"
checksum = "5f400b0f7905bf702f9f3dc3df5a121b16c54e9e8012c082905fdf09a931861a"
dependencies = [
"thiserror",
"ucd-trie",
@ -3274,16 +3265,16 @@ dependencies = [
[[package]]
name = "polling"
version = "2.4.0"
version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2"
checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"libc",
"log",
"wepoll-ffi",
"winapi",
"windows-sys 0.42.0",
]
[[package]]
@ -3833,18 +3824,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.147"
version = "1.0.148"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.147"
version = "1.0.148"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
dependencies = [
"proc-macro2",
"quote",
@ -4029,9 +4020,9 @@ dependencies = [
[[package]]
name = "smol"
version = "1.2.5"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85cf3b5351f3e783c1d79ab5fc604eeed8b8ae9abd36b166e8b87a089efd85e4"
checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
dependencies = [
"async-channel",
"async-executor",
@ -4042,7 +4033,6 @@ dependencies = [
"async-process",
"blocking",
"futures-lite",
"once_cell",
]
[[package]]
@ -4176,9 +4166,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.103"
version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
dependencies = [
"proc-macro2",
"quote",
@ -4515,7 +4505,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "vizia"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
dependencies = [
"vizia_baseview",
"vizia_core",
@ -4525,7 +4515,7 @@ dependencies = [
[[package]]
name = "vizia_baseview"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
dependencies = [
"baseview 0.1.0 (git+https://github.com/robbert-vdh/baseview.git?branch=feature/resize)",
"femtovg",
@ -4539,7 +4529,7 @@ dependencies = [
[[package]]
name = "vizia_core"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
dependencies = [
"bitflags",
"copypasta 0.8.1",
@ -4567,7 +4557,7 @@ dependencies = [
[[package]]
name = "vizia_derive"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
dependencies = [
"proc-macro2",
"quote",
@ -4577,12 +4567,12 @@ dependencies = [
[[package]]
name = "vizia_id"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
[[package]]
name = "vizia_input"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
dependencies = [
"bitflags",
"keyboard-types",
@ -4592,7 +4582,7 @@ dependencies = [
[[package]]
name = "vizia_storage"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
dependencies = [
"morphorm",
"vizia_id",
@ -4601,7 +4591,7 @@ dependencies = [
[[package]]
name = "vizia_window"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
dependencies = [
"morphorm",
"vizia_input",
@ -4610,7 +4600,7 @@ dependencies = [
[[package]]
name = "vizia_winit"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#db1632ea3c23373985e3ac44ca6201bc1be277c1"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=patched#9bc55a4ba309cff64dcf0192358842e73d40be46"
dependencies = [
"console_error_panic_hook",
"copypasta 0.8.1",
@ -5245,9 +5235,9 @@ dependencies = [
[[package]]
name = "x11"
version = "2.20.0"
version = "2.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908"
checksum = "c2638d5b9c17ac40575fb54bb461a4b1d2a8d1b4ffcc4ff237d254ec59ddeb82"
dependencies = [
"libc",
"pkg-config",
@ -5273,9 +5263,9 @@ dependencies = [
[[package]]
name = "x11-dl"
version = "2.20.0"
version = "2.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6"
checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0"
dependencies = [
"lazy_static",
"libc",
@ -5386,9 +5376,9 @@ dependencies = [
[[package]]
name = "zstd-sys"
version = "2.0.1+zstd.1.5.2"
version = "2.0.4+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0"
dependencies = [
"cc",
"libc",

View file

@ -121,14 +121,10 @@ impl WindowHandler for WrapperWindowHandler {
while let Ok(task) = self.gui_task_receiver.try_recv() {
match task {
GuiTask::Resize(new_width, new_height) => {
// Window resizing in baseview has only been implemented on Linux
#[cfg(target_os = "linux")]
{
window.resize(baseview::Size {
width: new_width as f64,
height: new_height as f64,
});
}
window.resize(baseview::Size {
width: new_width as f64,
height: new_height as f64,
});
}
GuiTask::Close => window.close(),
}