Merge pull request #79 from burtonageo/update_egui

Update egui version for main crate and egui example
urholaukkarinen · Oct 5, 2024 · 79dd894 · 79dd894
2 parents 5be0854 + e997263
commit 79dd894
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,11 +16,11 @@ transform-gizmo = { version = "0.3.0", path = "crates/transform-gizmo" }
 transform-gizmo-egui = { version = "0.3.0", path = "crates/transform-gizmo-egui" }
 transform-gizmo-bevy = { version = "0.3.0", path = "crates/transform-gizmo-bevy" }
 
-egui = "0.28.0"
-eframe = "0.28.0"
-emath = "0.28.0"
-epaint = "0.28.0"
-ecolor = "0.28.0"
+egui = "0.29.0"
+eframe = "0.29.0"
+emath = "0.29.0"
+epaint = "0.29.0"
+ecolor = "0.29.0"
 glam = { version = "0.28.0", features = ["mint"] }
 mint = "0.5"
 enum_dispatch = "0.3.12"

diff --git a/examples/egui/src/main.rs b/examples/egui/src/main.rs
@@ -116,7 +116,7 @@ impl ExampleApp {
             .num_columns(2)
             .show(ui, |ui| {
                 ui.label("Modes");
-                egui::ComboBox::from_id_source("mode_cb")
+                egui::ComboBox::from_id_salt("mode_cb")
                     .selected_text(format!("{}", self.gizmo_modes.len()))
                     .show_ui(ui, |ui| {
                         for mode in GizmoMode::all() {
@@ -132,7 +132,7 @@ impl ExampleApp {
                 ui.end_row();
 
                 ui.label("Orientation");
-                egui::ComboBox::from_id_source("orientation_cb")
+                egui::ComboBox::from_id_salt("orientation_cb")
                     .selected_text(format!("{:?}", self.gizmo_orientation))
                     .show_ui(ui, |ui| {
                         for orientation in [GizmoOrientation::Global, GizmoOrientation::Local] {