forked from 1b-agent/opencadstudio-upstream
Merge pull request #1758 from ramox81/codex/clip-enter-silent
CLIP: Enter at the object prompt ends silently # Conflicts: # src/command.rs
This commit is contained in:
commit
77825c1b15
3 files changed
+7
-3
No files matched your search
@@ -1310,7 +1310,9 @@ impl OpenCADStudio {
|
||||
self.tabs[i].snap_result = None;
|
||||
self.tabs[i].scene.clear_preview_wire();
|
||||
self.restore_pre_cmd_tangent();
|
||||
self.command_line.push_output(&msg);
|
||||
if !msg.is_empty() {
|
||||
self.command_line.push_output(&msg);
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_report_measurement(&mut self, msg: String) {
|
||||
|
||||
+2
-1
@@ -1965,7 +1965,8 @@ pub enum CmdResult {
|
||||
handles: Vec<Handle>,
|
||||
factor: f64,
|
||||
},
|
||||
/// Print a measurement result to the command line and end the command.
|
||||
/// Print a measurement result to the command line and end the command
|
||||
/// (an empty one ends it silently).
|
||||
Measurement(String),
|
||||
/// Print a measurement result and keep the command active.
|
||||
ReportMeasurement(String),
|
||||
|
||||
@@ -550,9 +550,10 @@ impl CadCommand for ClipCommand {
|
||||
self.inner.as_mut().and_then(|c| c.on_text_input(text))
|
||||
}
|
||||
fn on_enter(&mut self) -> CmdResult {
|
||||
// Enter before an object is picked ends CLIP without a message.
|
||||
self.inner
|
||||
.as_mut()
|
||||
.map_or(CmdResult::Cancel, |c| c.on_enter())
|
||||
.map_or(CmdResult::Measurement(String::new()), |c| c.on_enter())
|
||||
}
|
||||
fn on_mouse_move(&mut self, pt: DVec3) -> Option<WireModel> {
|
||||
self.inner.as_mut().and_then(|c| c.on_mouse_move(pt))
|
||||
|
||||
Reference in new issue
Block a user