AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(dynamic-input): offset the prompt/boxes off the crosshair evenly

Browse source 
The row layout sat flush against the cursor's horizontal axis. Place the
prompt one gap (the same as the horizontal offset) below the axis and the
value boxes a further gap below the prompt, so the block clears the
crosshair symmetrically.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-06-15 22:23:35 +03:00
commit 40a52cea79
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/ui/overlay.rs
View file

@ -1194,7 +1194,6 @@ fn draw_ucs_icon(frame: &mut canvas::Frame, vp: Mat4, bounds: iced::Rectangle) {
use crate::command::{DynGuide, DynRole}; use crate::command::{DynGuide, DynRole};
const DYN_OFFSET_X: f32 = 14.0; const DYN_OFFSET_X: f32 = 14.0;
const DYN_OFFSET_Y: f32 = 20.0;
const DYN_PAD: f32 = 4.0; const DYN_PAD: f32 = 4.0;
const DYN_GAP: f32 = 6.0; const DYN_GAP: f32 = 6.0;
const DYN_FONT: f32 = 11.0; const DYN_FONT: f32 = 11.0;
@ -1511,15 +1510,27 @@ impl DynInputCanvas {
let total_w: f32 = let total_w: f32 =
widths.iter().sum::<f32>() + DYN_GAP * (self.boxes.len() as f32 - 1.0); widths.iter().sum::<f32>() + DYN_GAP * (self.boxes.len() as f32 - 1.0);
let mut bx = self.cursor_screen.x + DYN_OFFSET_X; // Offset the block off the crosshair by the same gap horizontally and
let mut by = self.cursor_screen.y + DYN_OFFSET_Y; // vertically; the prompt sits a gap below the horizontal axis and the
if bx + total_w > bounds.width { // value boxes a further gap below the prompt.
bx = (self.cursor_screen.x - total_w - 4.0).max(0.0); let pad = DYN_OFFSET_X;
let has_prompt = !self.prompt.is_empty();
let prompt_w = (self.prompt.len() as f32 * DYN_CHAR_W) + DYN_PAD * 2.0;
let block_w = total_w.max(if has_prompt { prompt_w } else { 0.0 });
let mut bx = self.cursor_screen.x + pad;
let mut py = self.cursor_screen.y + pad;
let mut by = if has_prompt { py + DYN_BOX_H + pad } else { py };
if bx + block_w > bounds.width {
bx = (self.cursor_screen.x - block_w - 4.0).max(0.0);
} }
if by + DYN_BOX_H > bounds.height { if by + DYN_BOX_H > bounds.height {
by = (self.cursor_screen.y - DYN_BOX_H - 4.0).max(0.0); // Flip the block above the cursor, keeping the same gaps.
by = (self.cursor_screen.y - pad - DYN_BOX_H).max(0.0);
py = (by - pad - DYN_BOX_H).max(0.0);
}
if has_prompt {
self.draw_prompt(frame, Point { x: bx, y: py });
} }
self.draw_prompt(frame, Point { x: bx, y: (by - DYN_BOX_H - 2.0).max(0.0) });
let mut x = bx; let mut x = bx;
for (i, b) in self.boxes.iter().enumerate() { for (i, b) in self.boxes.iter().enumerate() {
@ -1573,7 +1584,7 @@ impl canvas::Program<Message> for DynInputCanvas {
if !self.prompt.is_empty() { if !self.prompt.is_empty() {
let pw = (self.prompt.len() as f32 * DYN_CHAR_W) + DYN_PAD * 2.0; let pw = (self.prompt.len() as f32 * DYN_CHAR_W) + DYN_PAD * 2.0;
let mut px = self.cursor_screen.x + DYN_OFFSET_X; let mut px = self.cursor_screen.x + DYN_OFFSET_X;
let mut py = self.cursor_screen.y + DYN_OFFSET_Y; let mut py = self.cursor_screen.y + DYN_OFFSET_X;
if px + pw > bounds.width { if px + pw > bounds.width {
px = (self.cursor_screen.x - pw - 4.0).max(0.0); px = (self.cursor_screen.x - pw - 4.0).max(0.0);
} }