diff --git a/src/app/browser/window/tab/item/page/input/default.rs b/src/app/browser/window/tab/item/page/input/default.rs index a5540765..afc99180 100644 --- a/src/app/browser/window/tab/item/page/input/default.rs +++ b/src/app/browser/window/tab/item/page/input/default.rs @@ -40,10 +40,11 @@ impl Default { let response = response.clone(); move |_, _| { control.update(match size_limit { - Some(limit_value) => Some( - limit_value - - (base.to_string_partial(UriHideFlags::QUERY).len() - + Uri::escape_string(response.text().as_str(), None, false).len()), + Some(limit) => Some( + limit as i32 + - (base.to_string_partial(UriHideFlags::QUERY).len() as i32 + + Uri::escape_string(response.text().as_str(), None, false).len() + as i32), ), None => None, }); diff --git a/src/app/browser/window/tab/item/page/input/default/control.rs b/src/app/browser/window/tab/item/page/input/default/control.rs index 3d3f6c48..7725e809 100644 --- a/src/app/browser/window/tab/item/page/input/default/control.rs +++ b/src/app/browser/window/tab/item/page/input/default/control.rs @@ -10,7 +10,7 @@ use gtk::Box; use std::sync::Arc; pub struct Control { - limit: Arc, + left: Arc, send: Arc, widget: Arc, } @@ -19,25 +19,21 @@ impl Control { // Construct pub fn new_arc() -> Arc { // Init components - let limit = Left::new_arc(); + let left = Left::new_arc(); let send = Send::new_arc(); // Init widget - let widget = Widget::new_arc(limit.gobject(), send.gobject()); + let widget = Widget::new_arc(left.gobject(), send.gobject()); // Return activated struct - Arc::new(Self { - limit, - send, - widget, - }) + Arc::new(Self { left, send, widget }) } // Actions - pub fn update(&self, left: Option) { + pub fn update(&self, chars_left: Option) { // Update children components - self.limit.update(left); - self.send.update(match left { + self.left.update(chars_left); + self.send.update(match chars_left { Some(value) => value > 0, None => false, }); diff --git a/src/app/browser/window/tab/item/page/input/default/control/left.rs b/src/app/browser/window/tab/item/page/input/default/control/left.rs index 8c9ce6b6..0dad5d6e 100644 --- a/src/app/browser/window/tab/item/page/input/default/control/left.rs +++ b/src/app/browser/window/tab/item/page/input/default/control/left.rs @@ -20,8 +20,8 @@ impl Left { } // Actions - pub fn update(&self, left: Option) { - self.widget.update(left); + pub fn update(&self, chars_left: Option) { + self.widget.update(chars_left); } // Getters diff --git a/src/app/browser/window/tab/item/page/input/default/control/left/widget.rs b/src/app/browser/window/tab/item/page/input/default/control/left/widget.rs index 3035b521..5f386c0f 100644 --- a/src/app/browser/window/tab/item/page/input/default/control/left/widget.rs +++ b/src/app/browser/window/tab/item/page/input/default/control/left/widget.rs @@ -14,17 +14,17 @@ impl Widget { } // Actions - pub fn update(&self, left: Option) { - match left { + pub fn update(&self, chars_left: Option) { + match chars_left { Some(value) => { - // Update color on limit reached + // Update color on chars left reached self.gobject .set_css_classes(&[if value > 0 { "success" } else { "error" }]); // @TODO add warning step? // Update text self.gobject.set_label(&value.to_string()); - // Toggle visibility if limit provided + // Toggle visibility on chars left provided self.gobject.set_visible(true); } None => self.gobject.set_visible(false),