Clarify Arrange cancellation and correct mounted typing fixture
This commit is contained in:
@@ -16,6 +16,7 @@ use std::{
|
||||
|
||||
pub const FINISH_EDIT: &str =
|
||||
"Finish or cancel the current edit before selecting or moving elements.";
|
||||
const ARRANGE_ARMED: &str = "Arrange next drag armed · presentation only · Esc cancels";
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||
pub struct Stamp {
|
||||
@@ -700,7 +701,12 @@ impl App {
|
||||
| Message::DiagramUsagesReady(_)
|
||||
| Message::DiagramRevealViewport(..)
|
||||
) {
|
||||
let clear_armed_status =
|
||||
self.allocation_drag.arrange_next && self.status == ARRANGE_ARMED;
|
||||
self.allocation_drag.retire();
|
||||
if clear_armed_status {
|
||||
self.status = "Arrange cancelled".into();
|
||||
}
|
||||
}
|
||||
}
|
||||
pub(super) fn allocation_boundary(&self) -> impl PartialEq + use<> {
|
||||
@@ -842,8 +848,7 @@ impl App {
|
||||
self.allocation_drag.retire();
|
||||
if self.allocation_drag_clean() {
|
||||
self.allocation_drag.arrange_next = true;
|
||||
self.status =
|
||||
"Arrange next drag armed · presentation only · Esc cancels".into();
|
||||
self.status = ARRANGE_ARMED.into();
|
||||
} else {
|
||||
self.status = FINISH_EDIT.into();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user