merge stable version #2

Merged
doryan merged 97 commits from experimental into main 2024-08-28 18:54:00 +03:00
Showing only changes of commit c1c9543868 - Show all commits

View File

@ -36,7 +36,14 @@ pub fn signal_reducing_page(wrapper: &Box) {
vertical: Align::Fill, vertical: Align::Fill,
}; };
let input_labels: [&str; 6] = ["l, м:", "Rм, Ом", "Cм, пФ:", "Rи, Ом:", "Vи, мВ", "f, мГц:"]; let input_labels: [&str; 6] = [
"l, м:",
"R<sub>м</sub>, Ом",
"C<sub>м</sub>, пФ:",
"R<sub>и</sub>, Ом:",
"V<sub>и</sub>, мВ",
"f, мГц:",
];
let all_inputs: Vec<Input<Entry>> = input_labels let all_inputs: Vec<Input<Entry>> = input_labels
.iter() .iter()
@ -44,6 +51,7 @@ pub fn signal_reducing_page(wrapper: &Box) {
.map(|(index, label)| { .map(|(index, label)| {
let elem = Input::<Entry>::builder() let elem = Input::<Entry>::builder()
.label(label) .label(label)
.markup(true)
.margins(MarginData::EqualsMargin(6)) .margins(MarginData::EqualsMargin(6))
.align(input_label_alignment) .align(input_label_alignment)
.build_entry(None); .build_entry(None);