Changeset 457

Timestamp:

Feb 17, 2023, 2:10:24 PM (2 years ago)

Author:

ataylor

Message:

Modify GetNiceDefaultFont to return the PM "Window Text" font setting, if available.

File:

• trunk/Components/ControlsUtility.pas (modified) (5 diffs)

trunk/Components/ControlsUtility.pas

@@ -5 +5 @@
 uses
   Classes, StdCtrls, SysUtils,
-  ACLUtility,
+  ACLUtility, StringUtilsUnit,
 {$ifdef win32}
   ExtCtrls, Forms, Controls, ComCtrls, Windows, Messages, Graphics;
@@ -121 +121 @@
   OverrideAppFontName: string;
   OverrideAppFontSize: string;
+  WindowTextFont:      string;
+  DefaultFontFromIni:  cstring;
+  DotPos:              integer;
 begin
   // For Marco!
   OverrideAppFontName := GetEnv( 'ACL_OVERRIDE_FONT_NAME' );
   OverrideAppFontSize := GetEnv( 'ACL_OVERRIDE_FONT_SIZE' );
+
+  // Use PM "Window Text" font if defined
+  if OverrideAppFontName = '' then
+  begin
+    PrfQueryProfileString( HINI_USERPROFILE, // OS2 INI
+                           'PM_SystemFonts', // app
+                           'WindowText',     // key
+                           '',               // default
+                           DefaultFontFromIni,
+                           sizeof( DefaultFontFromIni ));
+    if DefaultFontFromIni <> '' then
+    begin
+      WindowTextFont := DefaultFontFromIni;
+      DotPos := Pos('.', WindowTextFont );
+      if ( DotPos > 0 ) and ( DotPos < Length( WindowTextFont )) then
+      begin
+        OverrideAppFontSize := StrLeft( WindowTextFont, DotPos-1 );
+        OverrideAppFontName := StrSubstringFrom( WindowTextFont, DotPos+1 );
+      end;
+    end;
+  end;
 
   try
@@ -219 +243 @@
 const
   EndLineStr = #13 +#10;
-  
+
 Procedure AddBoldedLine( RichEdit: TRichEdit;
                          BoldPart: string;
@@ -273 +297 @@
   begin
     ExpandedNodeList.Add( Path + Node.Text );
-    
+
     SubNode := Node.getFirstChild;
     while SubNode <> nil do
@@ -754 +778 @@
 end;
 
-// Validate component memory and it's owned components
+// Validate component memory and its owned components
 procedure ValidateComponent( Component: TComponent );
 var