forked from 1b-agent/opencadstudio-upstream
Merge pull request #1353 from HakanSeven12/ui/options-ok-apply-close
feat(options): OK / Apply / Close with a discard guard # Conflicts: # src/app/view/modal.rs # src/ui/window/options.rs
This commit is contained in:
commit
1c0ef9d7a0
8 files changed
+365
-55
No files matched your search
@@ -265,7 +265,10 @@ impl OpenCADStudio {
|
||||
},
|
||||
)
|
||||
}
|
||||
super::super::ModalKind::Options => sized_flow(
|
||||
super::super::ModalKind::Options => {
|
||||
let dirty = self.options_dirty();
|
||||
let close_confirm = self.options_close_confirm;
|
||||
sized_flow(
|
||||
ex,
|
||||
880,
|
||||
620,
|
||||
@@ -361,10 +364,13 @@ impl OpenCADStudio {
|
||||
&self.paper_bg_input,
|
||||
&self.desk_bg_input,
|
||||
self.bg_picker,
|
||||
dirty,
|
||||
close_confirm,
|
||||
flow,
|
||||
)
|
||||
},
|
||||
),
|
||||
)
|
||||
}
|
||||
super::super::ModalKind::DraftingSettings => {
|
||||
let state = self.drafting_settings_state.as_ref();
|
||||
let dirty = self.drafting_settings_dirty();
|
||||
|
||||
Reference in new issue
Block a user