update egui and egui deps

dmackdev · Feb 10, 2025 · 8fb2d98 · 8fb2d98
1 parent 26df7bd
commit 8fb2d98
Show file tree

Hide file tree

Showing 9 changed files with 265 additions and 197 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pubsubman/Cargo.toml b/pubsubman/Cargo.toml
@@ -7,17 +7,17 @@ edition = "2021"
 [dependencies]
 chrono = { workspace = true }
 clap = { version = "4.4.0", features = ["derive"] }
-eframe = { version = "0.30", default-features = false, features = [
+eframe = { version = "0.31", default-features = false, features = [
   "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
   "default_fonts", # Embed the default egui fonts.
   "glow",          # Use the glow rendering backend. Alternative: "wgpu".
   "persistence",   # Enable restoring app state when restarting the app.
   "wayland",       # Required for Linux support (including CI!)
   "x11",
 ] }
-egui = "0.30"
-egui-notify = "0.18.0"
-egui_json_tree = "0.10.0"
+egui = "0.31"
+egui-notify = "0.19.0"
+egui_json_tree = "0.11.0"
 env_logger = "0.10"
 log = "0.4"
 pubsubman_backend = { version = "0.1.0", path = "../pubsubman_backend" }

diff --git a/pubsubman/src/app.rs b/pubsubman/src/app.rs
@@ -208,7 +208,7 @@ impl App {
                     });
 
                 egui::SidePanel::right("selected_message")
-                    .frame(egui::Frame::none())
+                    .frame(egui::Frame::NONE)
                     .resizable(true)
                     .show_animated(ctx, selected_message.is_some(), |ui| {
                         if let Some(message) = selected_message {

diff --git a/pubsubman/src/exit_state.rs b/pubsubman/src/exit_state.rs
@@ -17,10 +17,10 @@ pub enum SubscriptionCleanupState {
 }
 
 const MARGIN: egui::Margin = egui::Margin {
-    left: 16.0,
-    right: 16.0,
-    top: 12.0,
-    bottom: 4.0,
+    left: 16,
+    right: 16,
+    top: 12,
+    bottom: 4,
 };
 
 impl ExitState {
@@ -46,7 +46,7 @@ impl ExitState {
         };
 
         Modal::new("exit_modal".into()).show(ctx, |ui| {
-            egui::Frame::none().inner_margin(MARGIN).show(ui, |ui| {
+            egui::Frame::NONE.inner_margin(MARGIN).show(ui, |ui| {
                 ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| {
                     ui.heading(title);
                     ui.add_space(20.0);

diff --git a/pubsubman/src/ui/json_ui.rs b/pubsubman/src/ui/json_ui.rs
@@ -8,15 +8,13 @@ pub fn show_json_context_menu(ui: &mut egui::Ui, context: RenderContext<'_, '_,
         .context_menu(|ui| {
             let pointer = context.pointer().to_json_pointer_string();
             if !pointer.is_empty() && ui.button("Copy path").clicked() {
-                ui.output_mut(|o| {
-                    o.copied_text = pointer;
-                });
+                ui.ctx().copy_text(pointer);
                 ui.close_menu();
             }
 
             if ui.button("Copy contents").clicked() {
                 if let Ok(pretty_str) = serde_json::to_string_pretty(context.value()) {
-                    ui.output_mut(|o| o.copied_text = pretty_str);
+                    ui.ctx().copy_text(pretty_str);
                 }
                 ui.close_menu();
             }

diff --git a/pubsubman/src/ui/messages_view.rs b/pubsubman/src/ui/messages_view.rs
@@ -72,7 +72,7 @@ impl MessagesView {
                     let stream_mode_toggle = ui.add(
                         egui::Button::new("Stream")
                             .selected(self.stream_messages_enabled)
-                            .rounding(ui.visuals().widgets.active.rounding),
+                            .corner_radius(ui.visuals().widgets.active.corner_radius),
                     );
 
                     if stream_mode_toggle.clicked() {
@@ -167,16 +167,16 @@ impl MessagesView {
                     });
 
                     let outer_margin = egui::Margin {
-                        top: 8.0,
-                        bottom: 12.0,
+                        top: 8,
+                        bottom: 12,
                         ..Default::default()
                     };
 
-                    egui::Frame::none()
+                    egui::Frame::NONE
                         .fill(ui.style().visuals.panel_fill)
                         .inner_margin(egui::vec2(6.0, 3.0))
                         .outer_margin(outer_margin)
-                        .rounding(ui.style().visuals.window_rounding)
+                        .corner_radius(ui.style().visuals.window_corner_radius)
                         .show(ui, |ui| {
                             egui::ScrollArea::vertical()
                                 .stick_to_bottom(true)

diff --git a/pubsubman/src/ui/topic_name.rs b/pubsubman/src/ui/topic_name.rs
@@ -13,12 +13,12 @@ pub fn render_topic_name(
         (egui::Stroke::NONE, ui.visuals().code_bg_color)
     };
 
-    egui::Frame::none()
+    egui::Frame::NONE
         .stroke(stroke)
         .fill(fill)
-        .inner_margin(egui::Margin::same(7.5))
-        .outer_margin(egui::Margin::same(2.5))
-        .rounding(ui.visuals().window_rounding)
+        .inner_margin(egui::Margin::same(7))
+        .outer_margin(egui::Margin::same(2))
+        .corner_radius(ui.visuals().window_corner_radius)
         .show(ui, |ui| {
             ui.set_width(ui.available_width());
 

diff --git a/pubsubman/src/ui/validity_frame.rs b/pubsubman/src/ui/validity_frame.rs
@@ -5,20 +5,20 @@ pub trait ValidityFrame {
 impl ValidityFrame for &mut egui::Ui {
     fn validity_frame(&self, is_valid: bool) -> egui::Frame {
         let (stroke, rounding) = if is_valid {
-            (egui::Stroke::NONE, egui::Rounding::ZERO)
+            (egui::Stroke::NONE, egui::CornerRadius::ZERO)
         } else {
             (
                 egui::Stroke {
                     width: 1.0,
                     color: self.visuals().error_fg_color,
                 },
-                self.visuals().widgets.hovered.rounding,
+                self.visuals().widgets.hovered.corner_radius,
             )
         };
 
-        egui::Frame::none()
+        egui::Frame::NONE
             .stroke(stroke)
             .inner_margin(2.0)
-            .rounding(rounding)
+            .corner_radius(rounding)
     }
 }
diff --git a/rust-toolchain b/rust-toolchain
@@ -5,5 +5,5 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
 
 [toolchain]
-channel = "1.80.0"
+channel = "1.81.0"
 components = [ "rustfmt", "clippy" ]