Skip to content

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

Angle fields: a decimal point typed into an angle stays (#10582) (#10631)

austin62jake5e7f3651fb6f
diff --git a/crates/ui-egui/src/ui_kit/fields.rs b/crates/ui-egui/src/ui_kit/fields.rs
index b93f4e07af..69c37be779 100644
--- a/crates/ui-egui/src/ui_kit/fields.rs
+++ b/crates/ui-egui/src/ui_kit/fields.rs
@@ -1311,7 +1311,20 @@ pub(crate) fn bounded_length_field(
/// Angle in degrees, dragged or typed. Tokens: control_height, scope control/font tokens.
pub(crate) fn angle_field(ui: &mut Ui, value: &mut f64) -> Response {
- let response = ui.add(egui::DragValue::new(value).speed(1.0).suffix(" deg").custom_parser(crate::prefs::parse_number));
+ // An owner that keeps the angle in radians gives back the value the field set a hair off
+ // (-3 deg as -2.9999999999999996). The field takes that for a change made elsewhere and
+ // rewrites what is being typed from it, which drops a decimal point just typed: "-3." became
+ // "-3", and the 7 after it made -37 (#10582). It is given the value it set instead.
+ let set = ui.next_auto_id().with("angle_field_set");
+ let mut shown = *value;
+ if let Some(last) = ui.data(|d| d.get_temp::<f64>(set)).filter(|last| (last - shown).abs() <= 1e-9 * last.abs().max(1.0)) {
+ shown = last;
+ }
+ let response = ui.add(egui::DragValue::new(&mut shown).speed(1.0).suffix(" deg").custom_parser(crate::prefs::parse_number));
+ if response.changed() {
+ *value = shown;
+ ui.data_mut(|d| d.insert_temp(set, shown));
+ }
Tokens::get().input_bevel(ui, &response);
scenario::publish_target(&format!("dialog:angle:{}", label(ui)), response.rect);
response
diff --git a/crates/ui-egui/src/ui_kit/fields_tests.rs b/crates/ui-egui/src/ui_kit/fields_tests.rs
index 135c9a2477..0fc0777e49 100644
--- a/crates/ui-egui/src/ui_kit/fields_tests.rs
+++ b/crates/ui-egui/src/ui_kit/fields_tests.rs
@@ -614,6 +614,30 @@ fn placement_field_keeps_focus_for_owner_validation_on_enter() {
assert!(value.contains('x'));
}
+/// #10582: an angle typed a key at a time keeps its decimal point when its owner keeps it in
+/// radians, as Edit Canvas does, and so gives back a hair off the value the field set.
+#[test]
+fn an_angle_kept_in_radians_takes_a_typed_decimal_point() {
+ let ctx = crate::fonts::test_context();
+ let mut radians = 0.0_f64;
+ let mut draw = |ui: &mut Ui| {
+ row(ui, "Angle", |ui| {
+ let mut degrees = radians.to_degrees();
+ if angle_field(ui, &mut degrees).changed() {
+ radians = degrees.to_radians();
+ }
+ });
+ };
+ frame(&ctx, vec![], &mut draw);
+ let at = scenario::rect_of("dialog:angle:Angle").expect("the angle field").center();
+ frame(&ctx, pointer(at, true), &mut draw);
+ frame(&ctx, pointer(at, false), &mut draw);
+ for typed in ["-", "3", ".", "7"] {
+ frame(&ctx, vec![egui::Event::Text(typed.into())], &mut draw);
+ }
+ assert!((radians.to_degrees() + 3.7).abs() < 1e-9, "typed -3.7, the angle is {}", radians.to_degrees());
+}
+
#[test]
fn bounded_name_editor_keeps_unicode_character_cap() {
let ctx = crate::fonts::test_context();