More visual / UI fixes

Author: Tom

detailer/src/lib.rs

@@ -180,7 +180,7 @@ impl<'a> Widget<'a> {
         changed: &mut bool,
         k: &ConstraintKey,
         d: &mut f32,
-        ref_pt: &mut (f32, f32),
+        _ref_pt: &mut (f32, f32),
     ) {
         ui.horizontal(|ui| {
             let r = ui.available_size();
@@ -194,10 +194,6 @@ impl<'a> Widget<'a> {
                 .rect;
             ui.add_space(r.x / 2. - text_rect.width() - ui.spacing().item_spacing.x);
 
-            ui.add_sized(
-                [50., text_height],
-                egui::Label::new(format!("{:?}", ref_pt)).wrap(false),
-            );
             *changed |= ui
                 .add_sized([50., text_height * 1.4], egui::DragValue::new(d))
                 .changed();

drawing/src/constraints.rs

@@ -136,7 +136,7 @@ struct DimensionLengthOverlay<'a> {
 }
 
 impl<'a> DimensionLengthOverlay<'a> {
-    const LINE_STOP_OFFSET: f32 = 5.5;
+    const LINE_STOP_OFFSET: f32 = 8.5;
 
     pub fn draw(&self, painter: &egui::Painter, params: &crate::PaintParams) {
         let vp = &params.vp;
@@ -194,9 +194,9 @@ impl<'a> DimensionLengthOverlay<'a> {
             p2: text_pos,
         };
         if let Some(end) = arrow_line_1
-            .intersection_rect(&text_bounds.expand2((12., 2.).into()).translate(text_offset))
+            .intersection_rect(&text_bounds.expand2((10., 2.).into()).translate(text_offset))
         {
-            if sa.distance_sq(end) > 1950. {
+            if arrow_line_1.p1.distance_sq(end) > 750. {
                 painter.arrow(
                     end,
                     egui::Vec2::angled((sa - sb).angle()) * 20.,
@@ -210,9 +210,9 @@ impl<'a> DimensionLengthOverlay<'a> {
             p2: sb + v,
         };
         if let Some(end) = arrow_line_2
-            .intersection_rect(&text_bounds.expand2((12., 2.).into()).translate(text_offset))
+            .intersection_rect(&text_bounds.expand2((10., 2.).into()).translate(text_offset))
         {
-            if sb.distance_sq(end) > 1950. {
+            if arrow_line_2.p2.distance_sq(end) > 750. {
                 painter.arrow(
                     end,
                     egui::Vec2::angled((sb - sa).angle()) * 20.,

drawing/src/data/mod.rs

@@ -117,6 +117,7 @@ impl Data {
         self.solve_and_apply();
     }
 
+    /// NOTE: Only supports LineLength constraints atm, and consumes a SCREEN coordinate.
     pub fn move_constraint(&mut self, k: ConstraintKey, pos: egui::Pos2) {
         if let Some(Constraint::LineLength(_, fk, _, _)) = self.constraints.get(k) {
             let (a, b) = match self.features.get(*fk) {
@@ -140,7 +141,7 @@ impl Data {
 
             if let Some(Constraint::LineLength(_, fk, _, (ref_x, ref_y))) = self.constraint_mut(k) {
                 let c = a.lerp(b, 0.5);
-                let mut v = c.to_vec2() - pos.to_vec2();
+                let v = c.to_vec2() - pos.to_vec2();
                 let reference = egui::Vec2::angled((a - b).angle() - v.angle()) * v.length();
                 *ref_x = -reference.x;
                 *ref_y = reference.y;

drawing/src/lib.rs

@@ -199,6 +199,12 @@ impl<'a> Widget<'a> {
             None
         };
 
+        // All clicks get keyboard focus.
+        // println!("focus-w: {:?}", response.ctx.memory(|mem| mem.focus()));
+        if response.clicked() && !response.lost_focus() {
+            ui.memory_mut(|mem| mem.request_focus(response.id));
+        }
+
         // Handle: clicks altering selection
         if hp.is_some() && response.clicked_by(egui::PointerButton::Primary) {
             let shift_held = ui.input(|i| i.modifiers.shift);
@@ -216,7 +222,7 @@ impl<'a> Widget<'a> {
             }
         }
 
-        // Handle: escape clears collection
+        // Handle: escape clears collection - cant use focus check here?
         if hp.is_some()
             && self.drawing.selected_map.len() > 0
             && ui.input(|i| i.key_pressed(egui::Key::Escape))
@@ -225,12 +231,13 @@ impl<'a> Widget<'a> {
         }
 
         // Handle: Ctrl-A selects all
-        if hp.is_some() && ui.input(|i| i.key_pressed(egui::Key::A) && i.modifiers.ctrl) {
+        if response.has_focus() && ui.input(|i| i.key_pressed(egui::Key::A) && i.modifiers.ctrl) {
             self.drawing.select_all();
         }
 
         // Handle: delete selection
-        if hp.is_some()
+        if response.has_focus()
+            && hp.is_some()
             && self.drawing.selected_map.len() > 0
             && ui.input(|i| i.key_pressed(egui::Key::Delete))
         {
@@ -363,7 +370,11 @@ impl<'a> Widget<'a> {
         use egui::Sense;
         let (rect, response) = ui.allocate_exact_size(
             ui.available_size(),
-            Sense::click_and_drag().union(Sense::hover()),
+            Sense {
+                click: true,
+                drag: true,
+                focusable: true,
+            },
         );
         ui.set_clip_rect(rect);
 
@@ -375,7 +386,10 @@ impl<'a> Widget<'a> {
         if !has_init {
             self.drawing.vp.x = -rect.width() / 2.;
             self.drawing.vp.y = -rect.height() / 2.;
-            ui.memory_mut(|mem| mem.data.insert_temp(state_id, true));
+            ui.memory_mut(|mem| {
+                mem.data.insert_temp(state_id, true);
+                mem.request_focus(response.id); // request focus initially
+            });
         }
 
         // Find hover feature, if any

drawing/src/tools.rs

@@ -388,7 +388,7 @@ impl Toolbar {
         }
 
         // Hotkeys for switching tools
-        if hp.is_some() && !response.dragged() {
+        if response.has_focus() && !response.dragged() {
             let (l, p, s, d) = ui.input(|i| {
                 (
                     i.key_pressed(egui::Key::L),