From a0ff3dfc8aed478e3f2a45ebb54415694877b271 Mon Sep 17 00:00:00 2001 From: James Prince <83412999+james-prince@users.noreply.github.com> Date: Tue, 14 May 2024 11:21:09 +0100 Subject: [PATCH 1/2] Fixed minimum width check --- Project/Sources/Classes/Entry.4dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project/Sources/Classes/Entry.4dm b/Project/Sources/Classes/Entry.4dm index 4c52853..f7b7c6c 100644 --- a/Project/Sources/Classes/Entry.4dm +++ b/Project/Sources/Classes/Entry.4dm @@ -39,7 +39,7 @@ Class constructor($WindowTitle : Text; $TextDescription : Text; $AllMandatory : This.Bottom:=0 - This.ItemWidth:=Count parameters>=4 ? $ItemWidth : 350 + This.ItemWidth:=$ItemWidth#0 ? $ItemWidth : 350 This.ItemHeight:=25 If ($TextDescription#"") From f24097d09096518b28060a23e2e1fff93fc62db2 Mon Sep 17 00:00:00 2001 From: James Prince <83412999+james-prince@users.noreply.github.com> Date: Tue, 14 May 2024 11:21:23 +0100 Subject: [PATCH 2/2] Commented unused code --- Project/Sources/Classes/Entry.4dm | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Project/Sources/Classes/Entry.4dm b/Project/Sources/Classes/Entry.4dm index f7b7c6c..d4df947 100644 --- a/Project/Sources/Classes/Entry.4dm +++ b/Project/Sources/Classes/Entry.4dm @@ -571,31 +571,31 @@ Function addFileEntry($DataSourceFormula : 4D.Function; $LabelText : Text; $Mand ///////////////////////////////////////////////////////////////////////////////// -Function __addInput($EntryInput : cs.EntryInput) - This.__EntryInputCollection.push($EntryInput) + //Function __addInput($EntryInput : cs.EntryInput) + //This.__EntryInputCollection.push($EntryInput) -Function __newGetInput($AcceptButtonText : Text; $CancelButtonText : Text)->$Accepted : Boolean - This.Form.InitializationFormulaCollection:=[] - This.Form.ValidationFormulasObject:={} + //Function __newGetInput($AcceptButtonText : Text; $CancelButtonText : Text)->$Accepted : Boolean + //This.Form.InitializationFormulaCollection:=[] + //This.Form.ValidationFormulasObject:={} - var $EntryInput : cs.EntryInput - For each ($EntryInput; This.__EntryInputCollection) - This.Form.InitializationFormulaCollection.push($EntryInput.InitializationFormula) - - If (($EntryInput.LabelText || "")#"") - - End if - - This.Form.ValidationFormulasObject[$EntryInput.FormObjectName]:=$EntryInput.ValidationFormula - - This._addFormObject($EntryInput.FormObjectName; $EntryInput.FormObject; 0; 0; 0; 0) - This._Objects[$EntryInput.FormObjectName]:=$EntryInput.FormObject - - - End for each + //var $EntryInput : cs.EntryInput + //For each ($EntryInput; This.__EntryInputCollection) + //This.Form.InitializationFormulaCollection.push($EntryInput.InitializationFormula) - return This.getInput($AcceptButtonText; $CancelButtonText) - EntryClassLoad + //If (($EntryInput.LabelText || "")#"") + + //End if + + //This.Form.ValidationFormulasObject[$EntryInput.FormObjectName]:=$EntryInput.ValidationFormula + + //This._addFormObject($EntryInput.FormObjectName; $EntryInput.FormObject; 0; 0; 0; 0) + //This._Objects[$EntryInput.FormObjectName]:=$EntryInput.FormObject + + + //End for each + + //return This.getInput($AcceptButtonText; $CancelButtonText) + //EntryClassLoad Function _addFormObject($FormObjectName : Text; $FormObject : Object; $Top : Integer; $Left : Integer; $Height : Integer; $Width : Integer)