From ef7d2bfb0e3ace984bdbbfc6810f6aaffbb46800 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 6 Nov 2020 07:12:17 +1100
Subject: [PATCH] fix(developer): debug window inherits editor font

Fixes #3827.

The debugger was not inheriting the editor font -- this is a regression
from when we replaced TPlusMemo with Monaco editor.
---
 windows/src/developer/TIKE/child/UfrmDebug.pas        | 3 +--
 windows/src/developer/TIKE/child/UfrmKeymanWizard.pas | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/windows/src/developer/TIKE/child/UfrmDebug.pas b/windows/src/developer/TIKE/child/UfrmDebug.pas
index 22f22192f0..a93ef381b0 100644
--- a/windows/src/developer/TIKE/child/UfrmDebug.pas
+++ b/windows/src/developer/TIKE/child/UfrmDebug.pas
@@ -1171,8 +1171,7 @@ begin
   if FFont = nil then
   begin
     FDefaultFont := True;
-    //TODO:FFont := EditorMemo.AltFont;
-    FFont := Font;  //TODO scrap this
+    FFont := EditorMemo.CharFont;
   end
   else
     FDefaultFont := False;
diff --git a/windows/src/developer/TIKE/child/UfrmKeymanWizard.pas b/windows/src/developer/TIKE/child/UfrmKeymanWizard.pas
index 57ce633e92..b0e6faac5c 100644
--- a/windows/src/developer/TIKE/child/UfrmKeymanWizard.pas
+++ b/windows/src/developer/TIKE/child/UfrmKeymanWizard.pas
@@ -2884,9 +2884,7 @@ begin
   FDebugForm.OnClearBreakpoint := DebugClearBreakpoint;
   FDebugForm.OnUpdateExecutionPoint := DebugUpdateExecutionPoint;
   FDebugForm.Visible := True;
-
-
-// TODO:  FDebugForm.EditorMemo := frameSource.memo;
+  FDebugForm.EditorMemo := frameSource;
 
   FDebugStatusForm := TfrmDebugStatus.Create(Self);
   FDebugStatusForm.BorderStyle := bsNone;