From e8d5e01f146b2041bb9b3f49c90661498cd97b2f Mon Sep 17 00:00:00 2001
From: Martijn Laan <1092369+martijnlaan@users.noreply.github.com>
Date: Wed, 20 Nov 2024 16:11:45 +0100
Subject: [PATCH] Make it a bit clearer where to look for the VSCode editor
 keys option.

---
 Projects/Src/IDE.MainForm.pas    |  7 ++++---
 Projects/Src/IDE.OptionsForm.dfm |  1 +
 Projects/Src/IDE.OptionsForm.pas | 17 +++++++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Projects/Src/IDE.MainForm.pas b/Projects/Src/IDE.MainForm.pas
index ad928dfd..fefc4af5 100644
--- a/Projects/Src/IDE.MainForm.pas
+++ b/Projects/Src/IDE.MainForm.pas
@@ -882,7 +882,7 @@ constructor TMainForm.Create(AOwner: TComponent);
         'Your version of Inno Setup has been updated! <a id="hwhatsnew">See what''s new</a>.',
         $ABE3AB); //MGreen with HSL lightness changed from 40% to 78%
       CheckUpdatePanelMessage(Ini, 'VSCodeMemoKeyMap', 0, 1,
-        'Support for Visual Studio Code-style editor shortcuts has been added! Use the Options dialog and <a id="toptions">change the Editor Keys option</a>.',
+        'Support for Visual Studio Code-style editor shortcuts has been added! Use the Options dialog and <a id="toptions-vscode">change the Editor Keys option</a>.',
         $FFD399); //MBlue with HSL lightness changed from 42% to 80%
       UpdateUpdatePanel;
 
@@ -7768,9 +7768,10 @@ procedure TMainForm.UpdateLinkLabelLinkClick(Sender: TObject;
   var Handled := True;
   if (LinkType = sltID) and (Link = 'hwhatsnew') then
     HWhatsNew.Click
-  else if (LinkType = sltID) and (Link = 'toptions') then
+  else if (LinkType = sltID) and (Link = 'toptions-vscode') then begin
+    TOptionsForm.DropDownMemoKeyMappingComboBoxOnNextShow := True;
     TOptions.Click
-  else
+  end else
     Handled := False;
   if Handled then
     UpdatePanelClosePaintBoxClick(Sender);
diff --git a/Projects/Src/IDE.OptionsForm.dfm b/Projects/Src/IDE.OptionsForm.dfm
index 3f75ca60..d45eed13 100644
--- a/Projects/Src/IDE.OptionsForm.dfm
+++ b/Projects/Src/IDE.OptionsForm.dfm
@@ -15,6 +15,7 @@ object OptionsForm: TOptionsForm
   OldCreateOrder = True
   Position = poScreenCenter
   OnCreate = FormCreate
+  OnShow = FormShow
   DesignSize = (
     589
     424)
diff --git a/Projects/Src/IDE.OptionsForm.pas b/Projects/Src/IDE.OptionsForm.pas
index cdc05c79..11d32c10 100644
--- a/Projects/Src/IDE.OptionsForm.pas
+++ b/Projects/Src/IDE.OptionsForm.pas
@@ -62,10 +62,14 @@   TOptionsForm = class(TUIStateForm)
     procedure ChangeFontButtonClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure TabWidthEditChange(Sender: TObject);
+    procedure FormShow(Sender: TObject);
   private
-    { Private declarations }
+    class var
+      FDropDownMemoKeyMappingComboBoxOnNextShow: Boolean;
+    var
+      {}
   public
-    { Public declarations }
+    class property DropDownMemoKeyMappingComboBoxOnNextShow: Boolean write FDropDownMemoKeyMappingComboBoxOnNextShow;
   end;
 
 implementation
@@ -93,6 +97,15 @@ procedure TOptionsForm.FormCreate(Sender: TObject);
   ThemeComboBox.Items.Add('Classic');
 end;
 
+procedure TOptionsForm.FormShow(Sender: TObject);
+begin
+  if FDropDownMemoKeyMappingComboBoxOnNextShow then begin
+    ActiveControl := MemoKeyMappingComboBox;
+    MemoKeyMappingComboBox.DroppedDown := True;
+    FDropDownMemoKeyMappingComboBoxOnNextShow := False;
+  end;
+end;
+
 procedure TOptionsForm.AssocButtonClick(Sender: TObject);
 const
   UserStrings: array [Boolean] of String = ('the current user', 'all users');