all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer 3/7] tui: add optional min-value constraint to `NumericEditView` and `DiskSizeEditView`
Date: Wed,  4 Oct 2023 16:42:14 +0200	[thread overview]
Message-ID: <20231004144232.327071-4-c.heiss@proxmox.com> (raw)
In-Reply-To: <20231004144232.327071-1-c.heiss@proxmox.com>

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 proxmox-tui-installer/src/views/mod.rs | 46 ++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/proxmox-tui-installer/src/views/mod.rs b/proxmox-tui-installer/src/views/mod.rs
index 7efd487..0fe715e 100644
--- a/proxmox-tui-installer/src/views/mod.rs
+++ b/proxmox-tui-installer/src/views/mod.rs
@@ -60,6 +60,7 @@ where
 
 pub struct NumericEditView<T> {
     view: EditView,
+    min_value: Option<T>,
     max_value: Option<T>,
     max_content_width: Option<usize>,
     allow_empty: bool,
@@ -72,6 +73,7 @@ where
     pub fn new() -> Self {
         Self {
             view: EditView::new().content("0"),
+            min_value: None,
             max_value: None,
             max_content_width: None,
             allow_empty: false,
@@ -81,12 +83,20 @@ where
     pub fn new_empty() -> Self {
         Self {
             view: EditView::new(),
+            min_value: None,
             max_value: None,
             max_content_width: None,
             allow_empty: true,
         }
     }
 
+    pub fn with_range(min: T, max: T) -> Self {
+        let mut view = Self::new();
+        view.min_value = Some(min);
+        view.max_value = Some(max);
+        view
+    }
+
     pub fn max_value(mut self, max: T) -> Self {
         self.max_value = Some(max);
         self
@@ -113,12 +123,19 @@ where
         }
     }
 
+    pub fn set_min_value(&mut self, min: T) {
+        self.min_value = Some(min);
+    }
+
     pub fn set_max_value(&mut self, max: T) {
         self.max_value = Some(max);
     }
 
     fn in_range(&self, value: T) -> bool {
-        !self.max_value.map_or(false, |max| value >= max)
+        let too_small = self.min_value.map_or(false, |min| value < min);
+        let too_large = self.max_value.map_or(false, |max| value > max);
+
+        !too_small && !too_large
     }
 
     fn check_bounds(&mut self, original: Rc<String>, result: EventResult) -> EventResult {
@@ -226,6 +243,10 @@ impl DiskSizeEditView {
         Self { view }
     }
 
+    pub fn with_range(min: f64, max: f64) -> Self {
+        Self::new().min_value(min).max_value(max)
+    }
+
     pub fn content(mut self, content: f64) -> Self {
         if let Some(view) = self
             .view
@@ -255,13 +276,17 @@ impl DiskSizeEditView {
         }
     }
 
+    pub fn min_value(mut self, min: f64) -> Self {
+        if let Some(view) = self.get_inner_mut() {
+            view.set_min_value(min);
+        }
+
+        self
+    }
+
     pub fn max_value(mut self, max: f64) -> Self {
-        if let Some(view) = self
-            .view
-            .get_child_mut(0)
-            .and_then(|v| v.downcast_mut::<ResizedView<FloatEditView>>())
-        {
-            view.get_inner_mut().set_max_value(max);
+        if let Some(view) = self.get_inner_mut() {
+            view.set_max_value(max);
         }
 
         self
@@ -281,6 +306,13 @@ impl DiskSizeEditView {
             None => Err(NumericEditViewError::InvalidView),
         }
     }
+
+    fn get_inner_mut(&mut self) -> Option<&mut FloatEditView> {
+        self.view
+            .get_child_mut(0)
+            .and_then(|v| v.downcast_mut::<ResizedView<FloatEditView>>())
+            .map(|v| v.get_inner_mut())
+    }
 }
 
 impl ViewWrapper for DiskSizeEditView {
-- 
2.42.0





  parent reply	other threads:[~2023-10-04 14:42 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-04 14:42 [pve-devel] [PATCH installer 0/7] tui: add min/max constraints for bootdisk parameters Christoph Heiss
2023-10-04 14:42 ` [pve-devel] [PATCH installer 1/7] tui: fix setting content when using the `DiskSizeEditView` builder Christoph Heiss
2023-10-04 14:42 ` [pve-devel] [PATCH installer 2/7] tui: improve `FormView` error handling Christoph Heiss
2023-10-04 14:42 ` Christoph Heiss [this message]
2023-10-04 14:42 ` [pve-devel] [PATCH installer 4/7] tui: add min/max constraints for ZFS bootdisk parameters Christoph Heiss
2023-10-04 14:42 ` [pve-devel] [PATCH installer 5/7] tui: add min/max contraints for LVM " Christoph Heiss
2023-10-04 14:42 ` [pve-devel] [PATCH installer 6/7] tui: add min/max contraints for Btrfs " Christoph Heiss
2023-10-04 14:42 ` [pve-devel] [PATCH installer 7/7] tui: views: add some TUI component tests Christoph Heiss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231004144232.327071-4-c.heiss@proxmox.com \
    --to=c.heiss@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal