update egui to 0.29 and update egui deps

dmackdev · Oct 6, 2024 · b9bd5f3 · b9bd5f3
1 parent 4d7990e
commit b9bd5f3
Show file tree

Hide file tree

Showing 8 changed files with 385 additions and 357 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pubsubman/Cargo.toml b/pubsubman/Cargo.toml
@@ -7,15 +7,15 @@ edition = "2021"
 [dependencies]
 chrono = { workspace = true }
 clap = { version = "4.4.0", features = ["derive"] }
-eframe = { version = "0.28", default-features = false, features = [
+eframe = { version = "0.29", 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.
 ] }
-egui = "0.28"
-egui-notify = "0.15.0"
-egui_json_tree = "0.6.0"
+egui = "0.29"
+egui-notify = "0.16.0"
+egui_json_tree = "0.7.1"
 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
@@ -59,6 +59,7 @@ impl App {
 
         cc.egui_ctx
             .style_mut(|style| style.interaction.selectable_labels = false);
+        cc.egui_ctx.set_theme(egui::Theme::Dark);
 
         Self {
             topic_names: vec![],

diff --git a/pubsubman/src/main.rs b/pubsubman/src/main.rs
@@ -16,14 +16,9 @@ async fn main() -> eframe::Result<()> {
 
     let args = Args::parse();
 
-    let native_options = eframe::NativeOptions {
-        follow_system_theme: false,
-        ..Default::default()
-    };
-
     eframe::run_native(
         "pubsubman",
-        native_options,
+        Default::default(),
         Box::new(|cc| Ok(Box::new(pubsubman::App::new(cc, args.emulator_project_id)))),
     )
 }
diff --git a/pubsubman/src/notifications.rs b/pubsubman/src/notifications.rs
@@ -18,7 +18,7 @@ impl Notifications {
     }
 
     pub fn success(&mut self, message: String) {
-        self.toasts.success(message).set_show_progress_bar(false);
+        self.toasts.success(message).show_progress_bar(false);
     }
 
     pub fn error(&mut self, error: BackendError) {

diff --git a/pubsubman/src/ui/messages_view.rs b/pubsubman/src/ui/messages_view.rs
@@ -126,7 +126,7 @@ impl MessagesView {
                             }
 
                             let search_mode_changed =
-                                egui::ComboBox::from_id_source("search_mode_combo_box")
+                                egui::ComboBox::from_id_salt("search_mode_combo_box")
                                     .selected_text(format!("{}", self.search_mode))
                                     .width(50.0)
                                     .show_ui(ui, |ui| {

diff --git a/pubsubman/src/ui/publish_view/mod.rs b/pubsubman/src/ui/publish_view/mod.rs
@@ -26,7 +26,7 @@ impl PublishView {
         ui.heading("Publish New Message");
 
         egui::CollapsingHeader::new("Data")
-            .id_source(format!("{}-data", selected_topic.0))
+            .id_salt(format!("{}-data", selected_topic.0))
             .default_open(true)
             .show(ui, |ui| {
                 ui.add(
@@ -46,7 +46,7 @@ impl PublishView {
         };
 
         egui::CollapsingHeader::new(header_text)
-            .id_source(format!("{}-attributes", selected_topic.0))
+            .id_salt(format!("{}-attributes", selected_topic.0))
             .default_open(false)
             .show(ui, |ui| {
                 if !self.attributes.is_empty() {

diff --git a/pubsubman/src/ui/selected_message.rs b/pubsubman/src/ui/selected_message.rs
@@ -56,7 +56,7 @@ pub fn render_selected_message(
             });
 
             egui::CollapsingHeader::new("Data")
-                .id_source("selected_message_data_collapsing_header")
+                .id_salt("selected_message_data_collapsing_header")
                 .default_open(false)
                 .show(ui, |ui| {
                     JsonTree::new(
@@ -69,7 +69,7 @@ pub fn render_selected_message(
                 });
 
             egui::CollapsingHeader::new("Attributes")
-                .id_source("selected_message_attributes_collapsing_header")
+                .id_salt("selected_message_attributes_collapsing_header")
                 .default_open(false)
                 .show(ui, |ui| {
                     if message.attributes.is_empty() {