From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 515A791B70 for ; Wed, 4 Oct 2023 16:43:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2E8D6F444 for ; Wed, 4 Oct 2023 16:42:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 4 Oct 2023 16:42:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3D93C44864 for ; Wed, 4 Oct 2023 16:42:41 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 4 Oct 2023 16:42:12 +0200 Message-ID: <20231004144232.327071-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004144232.327071-1-c.heiss@proxmox.com> References: <20231004144232.327071-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -1.337 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy ENA_SUBJ_ODD_CASE 2.6 Subject has odd case KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH installer 1/7] tui: fix setting content when using the `DiskSizeEditView` builder X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Oct 2023 14:43:14 -0000 Previously, it would throw away all other settings (like `max_value`), if a construct like DiskSizeEditView::new().max_value(8.0).content(8.0) was used, due to simply replacing the inner view. Instead, modify the inner view. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/views/mod.rs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/proxmox-tui-installer/src/views/mod.rs b/proxmox-tui-installer/src/views/mod.rs index aa24fa4..76f96a1 100644 --- a/proxmox-tui-installer/src/views/mod.rs +++ b/proxmox-tui-installer/src/views/mod.rs @@ -1,4 +1,4 @@ -use std::{net::IpAddr, rc::Rc, str::FromStr}; +use std::{mem, net::IpAddr, rc::Rc, str::FromStr}; use cursive::{ event::{Event, EventResult}, @@ -190,8 +190,21 @@ impl DiskSizeEditView { } pub fn content(mut self, content: f64) -> Self { - if let Some(view) = self.view.get_child_mut(0).and_then(|v| v.downcast_mut()) { - *view = FloatEditView::new().content(content).full_width(); + if let Some(view) = self + .view + .get_child_mut(0) + .and_then(|v| v.downcast_mut::>()) + { + // We need actual ownership here of the inner `FloatEditView` to call `.content()` on + // it. Thus first swap it out with a dummy, modify it and swap it back in. + // This procedure ensures other settings (like `max_value`) is preserved on the inner + // view. + + let mut inner = FloatEditView::new(); + mem::swap(view.get_inner_mut(), &mut inner); + + inner = inner.content(content); + mem::swap(view.get_inner_mut(), &mut inner); } self -- 2.42.0