diff --git a/Cargo.lock b/Cargo.lock index 24a97537..cc430ca5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -397,12 +397,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - [[package]] name = "bitflags" version = "1.3.2" @@ -493,6 +487,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.9.0" @@ -865,7 +865,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "atomicwrites", "calloop 0.14.2", @@ -884,7 +884,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "quote", "syn 1.0.109", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#61c76a9d060827402eeb9fe92cae73ce159d66e5" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#a05129f1951eb81dcc37bae722c0c3a719c35aa2" dependencies = [ "cosmic-config", "serde", @@ -955,7 +955,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "almost", "cosmic-config", @@ -996,25 +996,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -1318,9 +1299,9 @@ dependencies = [ [[package]] name = "ecolor" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775cfde491852059e386c4e1deb4aef381c617dc364184c6f6afee99b87c402b" +checksum = "7d72e9c39f6e11a2e922d04a34ec5e7ef522ea3f5a1acfca7a19d16ad5fe50f5" dependencies = [ "bytemuck", "emath", @@ -1328,68 +1309,65 @@ dependencies = [ [[package]] name = "egui" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53eafabcce0cb2325a59a98736efe0bf060585b437763f8c476957fb274bb974" +checksum = "252d52224d35be1535d7fd1d6139ce071fb42c9097773e79f7665604f5596b5e" dependencies = [ "ahash", "emath", "epaint", "nohash-hasher", + "profiling", ] [[package]] name = "egui_extras" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3c1f5cd8dfe2ade470a218696c66cf556fcfd701e7830fa2e9f4428292a2a1" +checksum = "3d7a8198c088b1007108cb2d403bc99a5e370999b200db4f14559610d7330126" dependencies = [ "ahash", "egui", "enum-map", "log", "mime_guess2", + "profiling", "resvg 0.37.0", ] [[package]] name = "egui_glow" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e39bccc683cd43adab530d8f21a13eb91e80de10bcc38c3f1c16601b6f62b26" +checksum = "3eaf6264cc7608e3e69a7d57a6175f438275f1b3889c1a551b418277721c95e6" dependencies = [ "ahash", "bytemuck", "egui", - "glow 0.14.2", + "glow 0.16.0", "log", "memoffset", + "profiling", "wasm-bindgen", "web-sys", ] [[package]] name = "egui_plot" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8dca4871c15d51aadb79534dcf51a8189e5de3426ee7b465eb7db9a0a81ea67" +checksum = "c226cae80a6ee10c4d3aaf9e33bd9e9b2f1c0116b6036bdc2a1cfc9d2d0dcc10" dependencies = [ "ahash", "egui", "emath", ] -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - [[package]] name = "emath" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fe0049ce51d0fb414d029e668dd72eb30bc2b739bf34296ed97bd33df544f3" +checksum = "c4fe73c1207b864ee40aa0b0c038d6092af1030744678c60188a05c28553515d" dependencies = [ "bytemuck", ] @@ -1453,9 +1431,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32af8da821bd4f43f2c137e295459ee2e1661d87ca8779dfa0eaf45d870e20f" +checksum = "5666f8d25236293c966fbb3635eac18b04ad1914e3bab55bc7d44b9980cafcac" dependencies = [ "ab_glyph", "ahash", @@ -1465,13 +1443,14 @@ dependencies = [ "epaint_default_fonts", "nohash-hasher", "parking_lot 0.12.3", + "profiling", ] [[package]] name = "epaint_default_fonts" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "483440db0b7993cf77a20314f08311dbe95675092405518c0677aa08c151a3ea" +checksum = "66f6ddac3e6ac6fd4c3d48bb8b1943472f8da0f43a4303bcd8a18aa594401c80" [[package]] name = "equivalent" @@ -1535,21 +1514,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "exr" -version = "1.73.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" -dependencies = [ - "bit_field", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - [[package]] name = "fast-srgb8" version = "1.0.0" @@ -1977,9 +1941,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" +checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" dependencies = [ "js-sys", "slotmap", @@ -2260,7 +2224,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "dnd", "iced_core", @@ -2276,7 +2240,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "bitflags 2.7.0", "bytes", @@ -2299,7 +2263,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "futures", "iced_core", @@ -2324,7 +2288,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "bitflags 2.7.0", "bytemuck", @@ -2346,7 +2310,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2358,7 +2322,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "bytes", "dnd", @@ -2372,7 +2336,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "bytemuck", "cosmic-text", @@ -2388,7 +2352,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "as-raw-xcb-connection", "bitflags 2.7.0", @@ -2419,7 +2383,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "dnd", "iced_renderer", @@ -2588,20 +2552,16 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" +version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b" dependencies = [ "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", + "byteorder-lite", "num-traits", "png", - "qoi", - "tiff", + "zune-core", + "zune-jpeg", ] [[package]] @@ -2767,9 +2727,6 @@ name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" @@ -2881,12 +2838,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "libc" version = "0.2.169" @@ -2896,7 +2847,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#af9e353f5003cb323a46340acf1939123147a041" +source = "git+https://github.com/pop-os/libcosmic/#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "apply", "chrono", @@ -2912,6 +2863,7 @@ dependencies = [ "iced_runtime", "iced_tiny_skia", "iced_widget", + "image", "lazy_static", "palette", "serde", @@ -2964,7 +2916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3081,9 +3033,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "log-panics" @@ -4132,15 +4084,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "quick-xml" version = "0.36.2" @@ -4207,26 +4150,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - [[package]] name = "rctree" version = "0.5.0" @@ -4752,7 +4675,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=1ceba66#1ceba66e1c3b278b96a83e85a392278e8a7c9661" +source = "git+https://github.com/smithay//smithay?rev=fe31867#fe31867e3afac2543c4016fb8ed99df3e11eb6da" dependencies = [ "appendlist", "ash", @@ -4769,7 +4692,7 @@ dependencies = [ "errno", "gbm", "gl_generator", - "glow 0.14.2", + "glow 0.16.0", "indexmap 2.7.0", "input", "libc", @@ -4840,7 +4763,7 @@ dependencies = [ [[package]] name = "smithay-egui" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay-egui.git?rev=6118550#61185502f32c2d944fcf36e5edcb014fe0a8b8ac" +source = "git+https://github.com/Smithay/smithay-egui.git?rev=0b013bf#0b013bf934b5691de246e918914b62878fdb0db4" dependencies = [ "cgmath", "egui", @@ -4850,7 +4773,7 @@ dependencies = [ "log", "memoffset", "smithay", - "xkbcommon 0.7.0", + "xkbcommon 0.8.0", ] [[package]] @@ -5128,17 +5051,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - [[package]] name = "time" version = "0.3.37" @@ -5370,7 +5282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fff37da548239c3bf9e64a12193d261e8b22b660991c6fd2df057c168f435f" dependencies = [ "cc", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -5616,9 +5528,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "serde", ] @@ -6051,7 +5963,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -6733,12 +6645,18 @@ dependencies = [ ] [[package]] -name = "zune-inflate" -version = "0.2.54" +name = "zune-core" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028" dependencies = [ - "simd-adler32", + "zune-core", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 51f32244..16c4d150 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,8 @@ cosmic-config = {git = "https://github.com/pop-os/libcosmic/", features = ["call cosmic-protocols = {git = "https://github.com/pop-os/cosmic-protocols", rev = "d218c76", default-features = false, features = ["server"]} cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon" } libdisplay-info = "0.2.0" -egui = {version = "0.29.0", optional = true} -egui_plot = {version = "0.29.0", optional = true} +egui = {version = "0.30.0", optional = true} +egui_plot = {version = "0.30.0", optional = true} i18n-embed = {version = "0.14", features = ["fluent-system", "desktop-requester"]} i18n-embed-fl = "0.8" iced_tiny_skia = {git = "https://github.com/pop-os/libcosmic/"} @@ -85,14 +85,14 @@ features = [ "xwayland", ] git = "https://github.com/smithay/smithay.git" -rev = "3b0ecce" +rev = "fe31867" version = "0.3" [dependencies.smithay-egui] features = ["svg"] git = "https://github.com/Smithay/smithay-egui.git" optional = true -rev = "6118550" +rev = "0b013bf" [features] debug = ["egui", "egui_plot", "smithay-egui", "anyhow/backtrace"] @@ -117,4 +117,4 @@ inherits = "release" lto = "fat" [patch."https://github.com/Smithay/smithay.git"] -smithay = { git = "https://github.com/smithay//smithay", rev = "1ceba66" } +smithay = { git = "https://github.com/smithay//smithay", rev = "fe31867" } diff --git a/src/backend/render/mod.rs b/src/backend/render/mod.rs index 4d70c378..d296020a 100644 --- a/src/backend/render/mod.rs +++ b/src/backend/render/mod.rs @@ -531,9 +531,8 @@ where renderer.glow_renderer_mut(), state, timings, - Rectangle::from_loc_and_size( - (0, 0), - (output_geo.size.w.min(400), output_geo.size.h.min(800)), + Rectangle::from_size( + (output_geo.size.w.min(400), output_geo.size.h.min(800)).into(), ), scale, )