Fix how DayEdit deals with the weight field
This commit is contained in:
parent
b00acc64a3
commit
56d0a53666
|
@ -309,11 +309,11 @@ impl DayEdit {
|
||||||
_ => None,
|
_ => None,
|
||||||
});
|
});
|
||||||
|
|
||||||
let weight_view = match weight_record {
|
match weight_record {
|
||||||
Some((_id, data)) => WeightEdit::new(Some(data.clone())),
|
Some((_id, data)) => s.imp().weight.set_value(Some(data.weight)),
|
||||||
None => WeightEdit::new(None),
|
None => s.imp().weight.set_value(None),
|
||||||
};
|
};
|
||||||
s.append(&weight_view.widget());
|
s.append(&s.imp().weight.widget());
|
||||||
|
|
||||||
s
|
s
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,15 +20,25 @@ use std::{cell::RefCell, rc::Rc};
|
||||||
pub struct ParseError;
|
pub struct ParseError;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct TextEntry<T: Clone> {
|
pub struct TextEntry<T: Clone + std::fmt::Debug> {
|
||||||
value: Rc<RefCell<Option<T>>>,
|
value: Rc<RefCell<Option<T>>>,
|
||||||
widget: gtk::Entry,
|
widget: gtk::Entry,
|
||||||
renderer: Rc<Box<dyn Fn(&T) -> String>>,
|
renderer: Rc<Box<dyn Fn(&T) -> String>>,
|
||||||
parser: Rc<Box<dyn Fn(&str) -> Result<T, ParseError>>>,
|
parser: Rc<Box<dyn Fn(&str) -> Result<T, ParseError>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<T: Clone + std::fmt::Debug> std::fmt::Debug for TextEntry<T> {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
|
||||||
|
write!(
|
||||||
|
f,
|
||||||
|
"{{ value: {:?}, widget: {:?} }}",
|
||||||
|
self.value, self.widget
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// I do not understand why the data should be 'static.
|
// I do not understand why the data should be 'static.
|
||||||
impl<T: Clone + 'static> TextEntry<T> {
|
impl<T: Clone + std::fmt::Debug + 'static> TextEntry<T> {
|
||||||
pub fn new<R, V>(placeholder: &str, value: Option<T>, renderer: R, parser: V) -> Self
|
pub fn new<R, V>(placeholder: &str, value: Option<T>, renderer: R, parser: V) -> Self
|
||||||
where
|
where
|
||||||
R: Fn(&T) -> String + 'static,
|
R: Fn(&T) -> String + 'static,
|
||||||
|
@ -63,6 +73,7 @@ impl<T: Clone + 'static> TextEntry<T> {
|
||||||
}
|
}
|
||||||
match (self.parser)(buffer.text().as_str()) {
|
match (self.parser)(buffer.text().as_str()) {
|
||||||
Ok(v) => {
|
Ok(v) => {
|
||||||
|
println!("setting the value: {}", (self.renderer)(&v));
|
||||||
*self.value.borrow_mut() = Some(v);
|
*self.value.borrow_mut() = Some(v);
|
||||||
self.widget.remove_css_class("error");
|
self.widget.remove_css_class("error");
|
||||||
}
|
}
|
||||||
|
@ -74,6 +85,8 @@ impl<T: Clone + 'static> TextEntry<T> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn value(&self) -> Option<T> {
|
pub fn value(&self) -> Option<T> {
|
||||||
|
let v = self.value.borrow().clone();
|
||||||
|
println!("retrieving the value: {:?}", v.map(|v| (self.renderer)(&v)));
|
||||||
self.value.borrow().clone()
|
self.value.borrow().clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,7 @@ impl Weight {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
pub struct WeightEdit {
|
pub struct WeightEdit {
|
||||||
entry: TextEntry<si::Kilogram<f64>>,
|
entry: TextEntry<si::Kilogram<f64>>,
|
||||||
}
|
}
|
||||||
|
@ -64,6 +65,10 @@ impl WeightEdit {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn set_value(&self, value: Option<si::Kilogram<f64>>) {
|
||||||
|
self.entry.set_value(value);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn value(&self) -> Option<si::Kilogram<f64>> {
|
pub fn value(&self) -> Option<si::Kilogram<f64>> {
|
||||||
self.entry.value()
|
self.entry.value()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue