From c8a947bc748836975e04c3c369c1a420529661cc Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 14 Jan 2025 14:33:23 -0800 Subject: [PATCH] Update `smithay-egui`, `egui` --- Cargo.lock | 81 ++++++++++++++++++++++++--------------- Cargo.toml | 12 +++--- src/backend/render/mod.rs | 5 +-- 3 files changed, 59 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 24a97537..26174aff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -493,6 +493,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" @@ -1318,9 +1324,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,51 +1334,54 @@ 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", @@ -1387,9 +1396,9 @@ 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 +1462,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 +1474,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" @@ -1486,7 +1496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1977,9 +1987,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", @@ -2267,7 +2277,7 @@ dependencies = [ "iced_futures", "iced_renderer", "iced_widget", - "image", + "image 0.24.9", "mime 0.1.0", "thiserror 1.0.69", "window_clipboard", @@ -2332,7 +2342,7 @@ dependencies = [ "half", "iced_core", "iced_futures", - "image", + "image 0.24.9", "kamadak-exif", "log", "lyon_path", @@ -2604,6 +2614,17 @@ dependencies = [ "tiff", ] +[[package]] +name = "image" +version = "0.25.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits", +] + [[package]] name = "imagesize" version = "0.12.0" @@ -4466,7 +4487,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4752,7 +4773,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 +4790,7 @@ dependencies = [ "errno", "gbm", "gl_generator", - "glow 0.14.2", + "glow 0.16.0", "indexmap 2.7.0", "input", "libc", @@ -4840,17 +4861,17 @@ 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/ids1024/smithay-egui.git?branch=update#5d4c1965d03e443d076389524daf7d62de677f6a" dependencies = [ "cgmath", "egui", "egui_extras", "egui_glow", - "image", + "image 0.25.5", "log", "memoffset", "smithay", - "xkbcommon 0.7.0", + "xkbcommon 0.8.0", ] [[package]] @@ -5066,7 +5087,7 @@ dependencies = [ "getrandom", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6051,7 +6072,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.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 51f32244..67c41863 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" +git = "https://github.com/ids1024/smithay-egui.git" optional = true -rev = "6118550" +branch = "update" [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, )