Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

Sketch palette: Finish Sketch sits inside the footer's inset, label centred (#5387)

Kai Evans2c9d0a284784
diff --git a/crates/ui-egui/src/sketch_palette.rs b/crates/ui-egui/src/sketch_palette.rs
index b49551d9c1..c09f6e7505 100644
--- a/crates/ui-egui/src/sketch_palette.rs
+++ b/crates/ui-egui/src/sketch_palette.rs
@@ -611,7 +611,12 @@ mod tests {
h.app.run("sketch.create", json!({"plane":"XY"})).unwrap();
h.settle();
let at = crate::scenario::handle_at("sketch_palette:finish").expect("the palette ends in Finish Sketch");
- assert!(crate::scenario::rect_of("sketch_palette:look_at").is_some(), "Look At | Slice stay");
+ let look = crate::scenario::rect_of("sketch_palette:look_at").expect("Look At | Slice stay");
+ let slice = crate::scenario::rect_of("sketch_palette:slice").unwrap();
+ let finish = crate::scenario::rect_of("sketch_palette:finish").unwrap();
+ assert_eq!((finish.left(), finish.right()), (look.left(), slice.right()), "Finish {finish:?} shares the pair's inset");
+ assert_eq!(finish.height(), Tokens::get().form_button_height);
+ assert_eq!(look.top() - finish.bottom(), 2.0 * Tokens::get().space_6, "same spacing as the pair");
assert!(crate::scenario::handle_at("button:sketch.finish").is_some(), "and so does the ribbon's Finish");
h.call("ui.click", json!({"x":at.x,"y":at.y}));
assert!(h.app.session.active_sketch.is_none());
diff --git a/crates/ui-egui/src/ui_kit/actions.rs b/crates/ui-egui/src/ui_kit/actions.rs
index 87388e6960..fe290d1b80 100644
--- a/crates/ui-egui/src/ui_kit/actions.rs
+++ b/crates/ui-egui/src/ui_kit/actions.rs
@@ -368,17 +368,22 @@ pub(crate) fn primary_button(ui: &mut Ui, label: &str) -> Response {
response
}
-/// Accent action across the full width of its container, for the bottom of a panel. Tokens:
-/// `form_primary, on_accent, form_button_height, font_label`.
+/// Accent action across its container inside `button_pair`'s inset, label centred. Tokens:
+/// `form_primary, on_accent, form_button_height, font_label, control_radius, space_6/10`.
pub(crate) fn wide_primary_button(ui: &mut Ui, label: &str) -> Response {
let t = Tokens::get();
- let text = RichText::new(crate::i18n::tr_label(label)).size(t.font_label).color(if t.borders.bevel.is_some() { t.form_ink } else { t.on_accent });
- let size = vec2(ui.available_width(), t.form_button_height);
- let response = ui.add(
- egui::Button::new(crate::fonts::RichTextExt::bold_face(text))
- .fill(if t.borders.bevel.is_some() { t.control_fill } else { t.form_primary })
- .min_size(size),
- );
+ let bevel = t.borders.bevel.is_some();
+ let text = RichText::new(crate::i18n::tr_label(label)).size(t.font_label).color(if bevel { t.form_ink } else { t.on_accent });
+ let response = egui::Frame::NONE
+ .inner_margin(egui::Margin::symmetric(t.space_10 as i8, t.space_6 as i8))
+ .show(ui, |ui| {
+ let button = egui::Button::new(crate::fonts::RichTextExt::bold_face(text))
+ .fill(if bevel { t.control_fill } else { t.form_primary })
+ .stroke(egui::Stroke::NONE)
+ .corner_radius(t.control_radius);
+ ui.add_sized(vec2(dimension(ui.available_width()), t.form_button_height), button)
+ })
+ .inner;
t.button_bevel(ui, &response, false);
pointer_on_hover(ui, &response);
response