Skip to content

Commit

Permalink
Merge pull request #24 from james-prince/dev
Browse files Browse the repository at this point in the history
Fixed minimum width check on Entry class
  • Loading branch information
james-prince authored May 14, 2024
2 parents 8fde739 + f24097d commit f94c620
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions Project/Sources/Classes/Entry.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -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#"")
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit f94c620

Please sign in to comment.