forked from 1b-agent/opencadstudio-upstream
Keep show history independently editable
This commit is contained in:
1 parent
4ba0ea8808
commit
013703b5ba
1 file changed
+3
-10
@@ -75,13 +75,9 @@ fn history_flags(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn displayed_history_state(
|
fn displayed_history_state(
|
||||||
record_history: bool,
|
|
||||||
object_show_history: bool,
|
object_show_history: bool,
|
||||||
show_history_mode: i16,
|
show_history_mode: i16,
|
||||||
) -> (bool, bool) {
|
) -> (bool, bool) {
|
||||||
if !record_history {
|
|
||||||
return (false, false);
|
|
||||||
}
|
|
||||||
match show_history_mode {
|
match show_history_mode {
|
||||||
0 => (false, false),
|
0 => (false, false),
|
||||||
2 => (true, false),
|
2 => (true, false),
|
||||||
@@ -145,7 +141,7 @@ fn cone_properties(
|
|||||||
let (record_history, object_show_history, show_history_mode) =
|
let (record_history, object_show_history, show_history_mode) =
|
||||||
history_flags(document, handle).unwrap_or((false, false, 1));
|
history_flags(document, handle).unwrap_or((false, false, 1));
|
||||||
let (show_history, show_history_editable) =
|
let (show_history, show_history_editable) =
|
||||||
displayed_history_state(record_history, object_show_history, show_history_mode);
|
displayed_history_state(object_show_history, show_history_mode);
|
||||||
let show_value = if show_history { "Yes" } else { "No" };
|
let show_value = if show_history { "Yes" } else { "No" };
|
||||||
let mut geometry = vec![
|
let mut geometry = vec![
|
||||||
Property {
|
Property {
|
||||||
@@ -271,7 +267,7 @@ fn box_properties(
|
|||||||
let (record_history, object_show_history, show_history_mode) =
|
let (record_history, object_show_history, show_history_mode) =
|
||||||
history_flags(document, handle).unwrap_or((false, false, 1));
|
history_flags(document, handle).unwrap_or((false, false, 1));
|
||||||
let (show_history, show_history_editable) =
|
let (show_history, show_history_editable) =
|
||||||
displayed_history_state(record_history, object_show_history, show_history_mode);
|
displayed_history_state(object_show_history, show_history_mode);
|
||||||
let show_value = if show_history { "Yes" } else { "No" };
|
let show_value = if show_history { "Yes" } else { "No" };
|
||||||
vec![
|
vec![
|
||||||
PropSection {
|
PropSection {
|
||||||
@@ -451,11 +447,8 @@ pub fn apply_history_choice(
|
|||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
if !history.record_history {
|
|
||||||
history.show_history = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
PROP_SHOW_HISTORY if history.record_history && show_history_mode == 1 => {
|
PROP_SHOW_HISTORY if show_history_mode == 1 => {
|
||||||
history.show_history = if value.eq_ignore_ascii_case("Yes") {
|
history.show_history = if value.eq_ignore_ascii_case("Yes") {
|
||||||
true
|
true
|
||||||
} else if value.eq_ignore_ascii_case("No") {
|
} else if value.eq_ignore_ascii_case("No") {
|
||||||
|
|||||||
Reference in new issue
Block a user