Merge branch 'feature/issue#41-customise-detail-pane-font-size' into develop

Fixes #41

Author: delphidabbler

Docs/Design/FileFormats/config.html

@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Configuration Files
 -->
@@ -167,7 +167,7 @@ <h3>
 </p>
 
 <p>
-  There have been several versions of this file. The current one is version 17. The change to version 17 came with CodeSnip v4.19.0 and the addition of the [Prefs] section.
+  There have been several versions of this file. The current one is version 18. The change to version 18 came with CodeSnip v4.20.0 and the addition of the [Prefs] section.
 </p>
 
 <p>
@@ -917,7 +917,13 @@ <h4>
     <code class="key">OverviewFontSize</code> (Integer)
   </dt>
   <dd>
-    Size of font to be used in overview pane tree view. If missing or empty the default value is <code class="value">9</code>.
+    Size of font to be used in overview pane tree view. If missing or empty the default value is the default font size of the operationg system.
+  </dd>
+  <dt>
+    <code class="key">DetailFontSize</code> (Integer)
+  </dt>
+  <dd>
+    Size of font to be used in detail pane for all text except for source code. If missing or empty the default value is the default content font size of the operating system.
   </dd>
 </dl>
 

Src/FirstRun.UConfigFile.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements class that manages the updating of older config files to the
  * current format.
@@ -82,7 +82,7 @@   TUserConfigFileUpdater = class(TConfigFileUpdater)
   strict private
     const
       ///  <summary>Current user config file version.</summary>
-      FileVersion = 17;
+      FileVersion = 18;
   strict protected
     ///  <summary>Returns current user config file version.</summary>
     class function GetFileVersion: Integer; override;

Src/FrDetailView.pas

@@ -107,7 +107,7 @@ implementation
 
 uses
   // Delphi
-  SysUtils, Graphics, Menus,
+  SysUtils, Graphics, Menus, Math,
   // Project
   ActiveText.UHTMLRenderer, Browser.UHighlighter, Hiliter.UAttrs, Hiliter.UCSS,
   Hiliter.UGlobals, UColours, UCSSUtils, UFontHelper, UPreferences, UQuery,
@@ -119,27 +119,53 @@ implementation
 
 procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
 var
-  HiliteAttrs: IHiliteAttrs;  // syntax highlighter used to build CSS
-  CSSFont: TFont;             // font used to set CSS properties
+  HiliteAttrs: IHiliteAttrs;      // syntax highlighter used to build CSS
+  ContentFont: TFont;             // default content font sized per preferences
+  MonoFont: TFont;                // default mono font sized per preferences
+  CSSFont: TFont;                 // font used to set CSS properties
+  ContentFontScaleFactor: Single; // amount to increase font size by to get
+                                  // proportionally same increase as adding 1 to
+                                  // default content font size
+  MonoToContentFontRatio: Single; // ratio of size of mono font to content font
+  DefContentFontSize: Integer;    // default size of content font
+  DefMonoFontSize: Integer;       // default size of mono font
 begin
   // NOTE:
   // We only set CSS properties that may need to use system colours or fonts
   // that may be changed by user or changing program defaults. CSS that controls
   // layout remains in a CSS file embedded in resources.
   inherited;
+  ContentFont := nil;
+  MonoFont := nil;
   CSSFont := TFont.Create;
   try
+    MonoFont := TFont.Create;
+    ContentFont := TFont.Create;
+    TFontHelper.SetDefaultMonoFont(MonoFont);
+    TFontHelper.SetContentFont(ContentFont);
+    // Must do next two lines before changing content & mono font sizes
+    DefContentFontSize := ContentFont.Size;
+    DefMonoFontSize := MonoFont.Size;
+    ContentFontScaleFactor := 1.0 / DefContentFontSize;
+    MonoToContentFontRatio := DefMonoFontSize / DefContentFontSize;
+    ContentFont.Size := Preferences.DetailFontSize;
+    MonoFont.Size := Round(ContentFont.Size * MonoToContentFontRatio);
     // Set body style to use program's font and window colour
     with CSSBuilder.AddSelector('body') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
       AddProperty(TCSS.FontProps(CSSFont));
       AddProperty(TCSS.BackgroundColorProp(clWindow));
     end;
+    with CSSBuilder.Selectors['code'] do
+    begin
+      CSSFont.Assign(MonoFont);
+      AddProperty(TCSS.FontProps(CSSFont));
+    end;
     // Set table to use required font
     with CSSBuilder.AddSelector('table') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
       AddProperty(TCSS.FontProps(CSSFont));
       AddProperty(TCSS.BackgroundColorProp(clBorder));
     end;
@@ -149,31 +175,53 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
     // Sets H1 heading font size and border
     with CSSBuilder.AddSelector('h1') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
-      CSSFont.Size := CSSFont.Size + 2;
+      CSSFont.Assign(ContentFont);
+      CSSFont.Size := CSSFont.Size + Max(
+        Round(2 * ContentFontScaleFactor * CSSFont.Size), 2
+      );
       CSSFont.Style := [fsBold];
       AddProperty(TCSS.FontProps(CSSFont));
       AddProperty(TCSS.BorderProp(cssBottom, 1, cbsSolid, clBorder));
     end;
     // Sets H2 heading font size and border
     with CSSBuilder.AddSelector('h2') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
       CSSFont.Style := [fsBold];
       AddProperty(TCSS.FontProps(CSSFont));
     end;
     // Set H2 heading font for use in rendered active text
     with CSSBuilder.AddSelector('.active-text h2') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
       CSSFont.Style := [fsBold];
-      CSSFont.Size := CSSFont.Size + 1;
+      CSSFont.Size := CSSFont.Size + Max(
+        Round(ContentFontScaleFactor * CSSFont.Size), 1
+      );
+      AddProperty(TCSS.FontProps(CSSFont));
+    end;
+    // Set CODE tag within H2 heading for use in rendered active text
+    with CSSBuilder.AddSelector('.active-text h2 code') do
+    begin
+      CSSFont.Assign(MonoFont);
+      CSSFont.Style := [fsBold];
+      CSSFont.Size := CSSFont.Size + Max(
+        Round(ContentFontScaleFactor * CSSFont.Size), 1
+      );
       AddProperty(TCSS.FontProps(CSSFont));
     end;
     // Set H2 heading font for use in rendered active text in snippet list table
     with CSSBuilder.AddSelector('.snippet-list .active-text h2') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
+      CSSFont.Style := [fsBold];
+      AddProperty(TCSS.FontProps(CSSFont));
+    end;
+    // Set CODE within H2 heading font for use in rendered active text in
+    // snippet list table
+    with CSSBuilder.AddSelector('.snippet-list .active-text h2 code') do
+    begin
+      CSSFont.Assign(MonoFont);
       CSSFont.Style := [fsBold];
       AddProperty(TCSS.FontProps(CSSFont));
     end;
@@ -187,8 +235,8 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
     // Sets CSS for style of New Tab text
     with CSSBuilder.AddSelector('#newtab') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
-      CSSFont.Size := 36;
+      CSSFont.Assign(ContentFont);
+      CSSFont.Size := 36 + Round(36 * ContentFontScaleFactor);
       CSSFont.Color := clNewTabText;
       AddProperty(TCSS.FontProps(CSSFont));
     end;
@@ -218,6 +266,8 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
       AddProperty(TCSS.FontWeightProp(cfwNormal));
     end;
   finally
+    ContentFont.Free;
+    MonoFont.Free;
     CSSFont.Free;
   end;
 end;

Src/FrDisplayPrefs.dfm

@@ -40,6 +40,27 @@ inherited DisplayPrefsFrame: TDisplayPrefsFrame
     Caption = 'Overview tree view &font size: '
     FocusControl = cbOverviewFontSize
   end
+  object lblDetailFontSize: TLabel
+    Left = 16
+    Top = 232
+    Width = 105
+    Height = 13
+    Caption = 'Detail pane font si&ze: '
+    FocusControl = cbDetailFontSize
+  end
+  object lblHiliterInfo: TLabel
+    Left = 16
+    Top = 256
+    Width = 370
+    Height = 36
+    Caption = 
+      'To change the size of the source code font use the the Syntax Hi' +
+      'ghlighter options page.'
+    Color = clBtnFace
+    ParentColor = False
+    Transparent = True
+    WordWrap = True
+  end
   object cbOverviewTree: TComboBox
     Left = 192
     Top = 2
@@ -80,6 +101,14 @@ inherited DisplayPrefsFrame: TDisplayPrefsFrame
     Width = 57
     Height = 21
     TabOrder = 4
-    OnChange = cbOverviewFontSizeChange
+    OnChange = FontSizeChange
+  end
+  object cbDetailFontSize: TComboBox
+    Left = 192
+    Top = 229
+    Width = 57
+    Height = 21
+    TabOrder = 5
+    OnChange = FontSizeChange
   end
 end