From 614d99fc05fc4a2b4d576d714f7ffd8f28dfd7ab Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 24 Jun 2025 20:09:20 -0700 Subject: [PATCH] Update `smithay`, `egui`, and `smithay-egui` --- Cargo.lock | 42 ++++++++++++++++++++------------------- Cargo.toml | 10 +++++----- src/backend/kms/device.rs | 2 +- src/debug.rs | 8 ++++---- src/shell/element/mod.rs | 4 ++-- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e24eb978..88d24a62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1333,9 +1333,9 @@ dependencies = [ [[package]] name = "ecolor" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d72e9c39f6e11a2e922d04a34ec5e7ef522ea3f5a1acfca7a19d16ad5fe50f5" +checksum = "bc4feb366740ded31a004a0e4452fbf84e80ef432ecf8314c485210229672fd1" dependencies = [ "bytemuck", "emath", @@ -1343,11 +1343,12 @@ dependencies = [ [[package]] name = "egui" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252d52224d35be1535d7fd1d6139ce071fb42c9097773e79f7665604f5596b5e" +checksum = "25dd34cec49ab55d85ebf70139cb1ccd29c977ef6b6ba4fe85489d6877ee9ef3" dependencies = [ "ahash", + "bitflags 2.9.1", "emath", "epaint", "nohash-hasher", @@ -1356,9 +1357,9 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7a8198c088b1007108cb2d403bc99a5e370999b200db4f14559610d7330126" +checksum = "624659a2e972a46f4d5f646557906c55f1cd5a0836eddbe610fdf1afba1b4226" dependencies = [ "ahash", "egui", @@ -1371,9 +1372,9 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf6264cc7608e3e69a7d57a6175f438275f1b3889c1a551b418277721c95e6" +checksum = "910906e3f042ea6d2378ec12a6fd07698e14ddae68aed2d819ffe944a73aab9e" dependencies = [ "ahash", "bytemuck", @@ -1388,9 +1389,9 @@ dependencies = [ [[package]] name = "egui_plot" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c226cae80a6ee10c4d3aaf9e33bd9e9b2f1c0116b6036bdc2a1cfc9d2d0dcc10" +checksum = "1794c66fb727dac28dffed2e4b548e5118d1cccc331d368a35411d68725dde71" dependencies = [ "ahash", "egui", @@ -1399,9 +1400,9 @@ dependencies = [ [[package]] name = "emath" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe73c1207b864ee40aa0b0c038d6092af1030744678c60188a05c28553515d" +checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b" dependencies = [ "bytemuck", ] @@ -1465,9 +1466,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5666f8d25236293c966fbb3635eac18b04ad1914e3bab55bc7d44b9980cafcac" +checksum = "41fcc0f5a7c613afd2dee5e4b30c3e6acafb8ad6f0edb06068811f708a67c562" dependencies = [ "ab_glyph", "ahash", @@ -1482,9 +1483,9 @@ dependencies = [ [[package]] name = "epaint_default_fonts" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f6ddac3e6ac6fd4c3d48bb8b1943472f8da0f43a4303bcd8a18aa594401c80" +checksum = "fc7e7a64c02cf7a5b51e745a9e45f60660a286f151c238b9d397b3e923f5082f" [[package]] name = "equivalent" @@ -4730,8 +4731,9 @@ checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "smithay" -version = "0.6.0" -source = "git+https://github.com/smithay/smithay.git?rev=776ba42#776ba424423584400e76317e688b160546e68ca7" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740cea6927892bc182d5bf70c8f79806c8bc9f68f2fb96e55a30be171b63af98" dependencies = [ "aliasable", "appendlist", @@ -4821,9 +4823,9 @@ dependencies = [ [[package]] name = "smithay-egui" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f69e928bd02c12d7b66ba74fc68b984d77181be4309dd969ed4ef141c150241" +checksum = "6794c95b83518f9f91ae8c2faee52302d521c0d541d016b4ed632374041d9c42" dependencies = [ "cgmath", "egui", diff --git a/Cargo.toml b/Cargo.toml index a364e313..ec22b39f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,8 @@ cosmic-protocols = {git = "https://github.com/pop-os/cosmic-protocols", rev = "e cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon" } cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", features = ["shape-run-cache"] } libdisplay-info = "0.2.0" -egui = {version = "0.30.0", optional = true} -egui_plot = {version = "0.30.0", optional = true} +egui = {version = "0.31.0", optional = true} +egui_plot = {version = "0.31.0", optional = true} i18n-embed = {version = "0.15", features = ["fluent-system", "desktop-requester"]} i18n-embed-fl = "0.9" iced_tiny_skia = {git = "https://github.com/pop-os/libcosmic/"} @@ -72,7 +72,7 @@ branch = "feature/copy_clone" git = "https://github.com/Drakulix/id-tree.git" [dependencies.smithay] -version = "0.6.0" +version = "0.7.0" default-features = false features = [ "backend_drm", @@ -93,7 +93,7 @@ features = [ ] [dependencies.smithay-egui] -version = "0.1.0" +version = "0.2.0" features = ["svg"] optional = true @@ -124,4 +124,4 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" } [patch.crates-io] -smithay = { git = "https://github.com/smithay/smithay.git", rev = "776ba42" } +# smithay = { git = "https://github.com/smithay/smithay.git", branch = "a166cf4" } diff --git a/src/backend/kms/device.rs b/src/backend/kms/device.rs index 806499c3..7bc8c8ea 100644 --- a/src/backend/kms/device.rs +++ b/src/backend/kms/device.rs @@ -264,7 +264,7 @@ impl State { gbm.clone(), GbmBufferFlags::RENDERING | GbmBufferFlags::SCANOUT, ), - GbmFramebufferExporter::new(gbm.clone()), + GbmFramebufferExporter::new(gbm.clone(), Some(drm_node)), Some(gbm.clone()), [ Fourcc::Abgr2101010, diff --git a/src/debug.rs b/src/debug.rs index 98577da6..f55b8df4 100644 --- a/src/debug.rs +++ b/src/debug.rs @@ -184,9 +184,9 @@ pub fn fps_ui<'a>( for seat in seats { ui.label(egui::RichText::new(format!("\t{}", seat.name())).strong()); if let Some(ptr) = seat.get_pointer() { - egui::Frame::none() + egui::Frame::NONE .fill(egui::Color32::DARK_GRAY) - .rounding(5.) + .corner_radius(5.) .inner_margin(10.) .show(ui, |ui| { ui.label( @@ -213,9 +213,9 @@ pub fn fps_ui<'a>( }); } if let Some(kbd) = seat.get_keyboard() { - egui::Frame::none() + egui::Frame::NONE .fill(egui::Color32::DARK_GRAY) - .rounding(5.) + .corner_radius(5.) .inner_margin(10.) .show(ui, |ui| { let mut keysyms = format!( diff --git a/src/shell/element/mod.rs b/src/shell/element/mod.rs index f6aa3f6d..69112ae3 100644 --- a/src/shell/element/mod.rs +++ b/src/shell/element/mod.rs @@ -685,9 +685,9 @@ impl CosmicMapped { ], ) .show(ctx, |ui| { - egui::Frame::none() + egui::Frame::NONE .fill(egui::Color32::BLACK) - .rounding(5.0) + .corner_radius(5.0) .inner_margin(10.0) .show(ui, |ui| { ui.heading(window.title());