Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

egui 0.37: the renamed APIs in this branch's code

moppeeercd84bd903ae9
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index 35031149a..d6da8e43e 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -3305,7 +3305,7 @@ const FORMAT_SECTIONS: &[(&str, &str)] = &[
fn info_icon(ui: &mut egui::Ui, tip: &str) {
let (r, resp) = ui.allocate_exact_size(egui::vec2(16.0, 16.0), egui::Sense::hover());
crate::icons::paint(ui.painter(), r, "info", crate::theme::Tokens::get(ui.ctx()).icon);
- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, tip));
+ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, tip));
resp.on_hover_text(tip);
}
@@ -3383,7 +3383,7 @@ fn format_settings(app: &mut DesignApp, ctx: &egui::Context, d: &mut Dialog) {
let find = fd.s("for") == "find";
let popup_open = egui::Popup::is_any_open(ctx);
let mut result = None;
- let host = egui::Id::new("format_settings");
+ let host = egui::Id::unique("format_settings");
crate::modal_drag::modal(ctx, host, host).backdrop_color(egui::Color32::TRANSPARENT).show(ctx, |ui| {
let title_top = ui.cursor().top();
let title = if find { "Find Format Settings" } else { "Change Format Settings" };
diff --git a/crates/ui-egui/src/dialogs/tests.rs b/crates/ui-egui/src/dialogs/tests.rs
index c80127706..e1ce3f2dd 100644
--- a/crates/ui-egui/src/dialogs/tests.rs
+++ b/crates/ui-egui/src/dialogs/tests.rs
@@ -3542,7 +3542,7 @@ fn find_change_gives_the_found_text_a_change_format() {
}
let mut h = Harness::builder().with_size(egui::vec2(1200.0, 900.0)).build_ui_state(
|ui, app: &mut DesignApp| {
- let key = egui::Id::new("change_format_test_fonts");
+ let key = egui::Id::unique("change_format_test_fonts");
if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(key, true));
@@ -3632,7 +3632,7 @@ fn find_format_finds_only_text_with_it() {
}
let mut h = Harness::builder().with_size(egui::vec2(1200.0, 900.0)).build_ui_state(
|ui, app: &mut DesignApp| {
- let key = egui::Id::new("find_format_test_fonts");
+ let key = egui::Id::unique("find_format_test_fonts");
if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(key, true));