ACI0104990 integration in 20.x

Author: Roland-Lannuzel

Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontSizeInput.4dm

@@ -1,11 +1,7 @@
-
-C_LONGINT:C283($fontSize)
-
-If (oForm.fontSize<=0)  // check <=0  (must be >=1)
+If (oForm.fontSize<1)  // check < 1  (must be >=1)
 	oForm.fontSize:=1
 End if 
-$fontSize:=oForm.fontSize
 
-WP_SetFontSize(Form:C1466.selection; $fontSize)
+WP_SetFontSize(Form:C1466.selection; oForm.fontSize)
 
-//(OBJECT Get pointer(Object named;"fontSizeRuler"))->:=Self->  // report value into ruler
+UI_PaletteFonts  // ACI0104990 Pat Bensky

Project/Sources/Forms/WP_Toolbar/ObjectMethods/cbox_FontSize.4dm

@@ -1,3 +1,9 @@
+If (oForm.comboFontSizes.currentValue<1)  // check < 1  (must be >=1)
+	oForm.comboFontSizes.currentValue:=1
+End if 
 
 WP_SetFontSize(Form:C1466.selection; oForm.comboFontSizes.currentValue)
+
 WP_BackToArea
+
+UI_Toolbar  // ACI0104990 Pat Bensky

Project/Sources/Methods/UI_PaletteFonts.4dm

@@ -37,3 +37,13 @@ Else
 	OBJECT SET ENTERABLE:C238(*; "LinethroughColor"; False:C215)
 
 End if 
+
+// ACI0104990 Pat Bensky
+Case of 
+	: (oForm.fontSize=Int:C8(oForm.fontSize))
+		OBJECT SET FORMAT:C236(*; "fontSizeInput"; "###0;-###0;0")
+	: ((oForm.fontSize*10)=Int:C8(oForm.fontSize*10))
+		OBJECT SET FORMAT:C236(*; "fontSizeInput"; "###0.0;-###0.0;0")
+	Else 
+		OBJECT SET FORMAT:C236(*; "fontSizeInput"; "###0.00;-###0.0;00")
+End case 

Project/Sources/Methods/UI_Toolbar.4dm

@@ -48,6 +48,18 @@ If (Form:C1466#Null:C1517)  //;"The variable associated to the toolbar should be
 				UI_PaletteFindAndReplace  //ACI0103628 - see method too
 
 			Else 
+				If ($page=1)
+					// ACI0104990 Pat Bensky
+					Case of 
+						: (oForm.fontSize=Int:C8(oForm.fontSize))
+							OBJECT SET FORMAT:C236(*; "cbox_FontSize"; "###0;-###0;0")
+						: ((oForm.fontSize*10)=Int:C8(oForm.fontSize*10))
+							OBJECT SET FORMAT:C236(*; "cbox_FontSize"; "###0.0;-###0.0;0")
+						Else 
+							OBJECT SET FORMAT:C236(*; "cbox_FontSize"; "###0.00;-###0.0;00")
+					End case 
+				End if 
+				
 				// general cases after
 				If ($page=1) || ($page=11)  // both pages have enterable areas
 					$protected:=UI_isProtected(False:C215)  // 2022 oct 13 (TEST) don't manage focus on page 1 because fontSize is focusable

Project/Sources/Methods/WP_GetFontInfo.4dm

@@ -12,12 +12,15 @@ C_BOOLEAN:C305($redraw)
 
 C_LONGINT:C283($p)
 C_LONGINT:C283($frameColor)
-C_LONGINT:C283($fontSize; $color)
+C_LONGINT:C283($color)
+
 C_LONGINT:C283($rangeStart; $rangeEnd)
 
 C_TEXT:C284($fontFamily)
 C_TEXT:C284($font)
 
+var $fontSize : Real  // ACI0104990 Pat Bensky
+
 If (Count parameters:C259<2)
 	$check:=False:C215
 End if 

Project/Sources/Methods/WP_SetFontSize.4dm

@@ -1,9 +1,12 @@
 //%attributes = {"invisible":true}
-#DECLARE($range : Object; $size : Integer)
+#DECLARE($range : Object; $size : Real)  // ACI0104990 Pat Bensky
 
 If (Not:C34(OB Is empty:C1297($range))) && ($range.type#2)
+	If ($size<1)  // interface should not allow this, just in case…
+		$size:=1
+	End if 
 	// set the size (always in pt)
 	//WP RESET ATTRIBUTES($range;wk style sheet)  //†††
 	WP SET ATTRIBUTES:C1342($range; wk font size:K81:66; $size)
-End if 
-
+	oForm.fontSize:=$size
+End if 

Project/Sources/catalog.4DCatalog

@@ -30,7 +30,7 @@
 			<table_ref uuid="FCDC2942AAC24F1C8E119520A0C6B44B" name="SAMPLE"/>
 		</field_ref>
 	</index>
-	<base_extra package_name="4D WritePro Interface" structure_file_name="4D WritePro Interface" data_file_path=":4D WritePro Interface.4DD">
+	<base_extra package_name="4D WritePro Interface" structure_file_name="4D WritePro Interface" data_file_path=":4D WritePro Interface.4DD" __stringCompHash="icu:73.2.0" __keywordBuildingHash="icu:73.2.0">
 		<journal_file journal_file_enabled="false"/>
 	</base_extra>
 </base>