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

moppeeerd40bb87def46
diff --git a/crates/ui-egui/src/panels/pages.rs b/crates/ui-egui/src/panels/pages.rs
index 6834e56a2..4fe7fea8a 100644
--- a/crates/ui-egui/src/panels/pages.rs
+++ b/crates/ui-egui/src/panels/pages.rs
@@ -427,7 +427,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
// ---- Document spreads.
let cur = crate::canvas::current_page(app).unwrap_or(0);
let cur_spread = doc.page_loc(cur).map(|l| l.0);
- let followed_id = egui::Id::new("pages_panel_followed");
+ let followed_id = egui::Id::unique("pages_panel_followed");
let dragging = egui::DragAndDrop::has_any_payload(ui.ctx());
let tallest = doc.spreads.iter().flat_map(|sp| sp.pages.iter().map(|p| p.height)).fold(doc.settings.page_height, f64::max).max(1.0);
let th = opts.page_size.page_h();
@@ -490,7 +490,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
crate::i18n::tr(&app.ui.language, "Numbering & Section Options…").trim_end_matches('…'),
app.session.page_label(abs)
);
- marker.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &label));
+ marker.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &label));
// A double click, or the keyboard or a screen reader activating it (a
// single pointer click only selects, as on a page).
let activated = marker.double_clicked() || marker.clicked() && !marker.clicked_by(egui::PointerButton::Primary);
@@ -552,7 +552,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
}
ui.painter().galley(c - g.size() / 2.0, g, Color32::WHITE);
let lr = ui.interact(br, ui.scope_id().with(("spread_label", si)), Sense::click());
- lr.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, &label));
+ lr.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, &label));
if lr.clicked() {
if editing_parents {
let _ = app.run("layout.parents.edit", json!({"on": false}));
@@ -831,7 +831,7 @@ mod spread_label_tests {
app.run("layout.parents.edit", json!({"on": true})).unwrap();
let mut h = Harness::builder().with_size(vec2(280.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
|ui, app: &mut DesignApp| {
- let key = egui::Id::new("section_marker_test_fonts");
+ let key = egui::Id::unique("section_marker_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));
@@ -865,7 +865,7 @@ mod spread_label_tests {
app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(1000.0, 800.0)));
let mut h = Harness::builder().with_size(vec2(280.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
|ui, app: &mut DesignApp| {
- let key = egui::Id::new("section_marker_key_test_fonts");
+ let key = egui::Id::unique("section_marker_key_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));
@@ -922,7 +922,7 @@ mod spread_label_tests {
app.canvas_rect = Some(egui::Rect::from_min_size(egui::pos2(0.0, 0.0), vec2(1000.0, 800.0)));
let mut h = Harness::builder().with_size(vec2(260.0, 900.0)).build_ui_state(
|ui, app: &mut DesignApp| {
- let key = egui::Id::new("test_fonts");
+ let key = egui::Id::unique("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));