Reactivate TSynHotKey again, after removing it accidentally in recent…

… SynEdit update. Should fix a crashing preferences dialog.
HeidiSQL · Jan 2, 2018 · e6111ef · e6111ef
1 parent 36c5d90
commit e6111ef
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/components/synedit/Source/SynEditMiscClasses.pas b/components/synedit/Source/SynEditMiscClasses.pas
@@ -372,6 +372,9 @@   TSynHotKey = class(TCustomControl)
     FInvalidKeys: THKInvalidKeys;
     FModifiers: THKModifiers;
     FPressedOnlyModifiers: Boolean;
+    FOnChange: TNotifyEvent;
+    FOnEnter: TNotifyEvent;
+    FOnExit: TNotifyEvent;
     procedure SetBorderStyle(const Value: TSynBorderStyle);
     procedure SetHotKey(const Value: TShortCut);
     procedure SetInvalidKeys(const Value: THKInvalidKeys);
@@ -404,6 +407,9 @@   TSynHotKey = class(TCustomControl)
     property HotKey: TShortCut read FHotKey write SetHotKey default $0041; { Alt+A }
     property InvalidKeys: THKInvalidKeys read FInvalidKeys write SetInvalidKeys default [hcNone, hcShift];
     property Modifiers: THKModifiers read FModifiers write SetModifiers default [hkAlt];
+    property OnChange: TNotifyEvent read FOnChange write FOnChange;
+    property OnEnter: TNotifyEvent read FOnEnter write FOnEnter;
+    property OnExit: TNotifyEvent read FOnExit write FOnExit;
   end;
 
   TSynEditSearchCustom = class(TComponent)
@@ -1604,6 +1610,8 @@ procedure TSynHotKey.KeyDown(var Key: Word; Shift: TShiftState);
   end;
 
   Key := SavedKey;
+  if Assigned(FOnChange) then
+    FOnChange(Self);
 end;
 
 procedure TSynHotKey.KeyUp(var Key: Word; Shift: TShiftState);
@@ -1652,6 +1660,10 @@ procedure TSynHotKey.Paint;
   Canvas.Brush.Color := Color;
   InflateRect(r, -BorderWidth, -BorderWidth);
   Canvas.FillRect(r);
+  if Enabled then
+    Canvas.Font.Color := clWindowText
+  else
+    Canvas.Font.Color := clGrayText;
   TextRect(Canvas, r, BorderWidth + 1, BorderWidth + 1, Text);
 end;
 
@@ -1716,6 +1728,8 @@ procedure TSynHotKey.WMGetDlgCode(var Message: TMessage);
 procedure TSynHotKey.WMKillFocus(var Msg: TWMKillFocus);
 begin
   DestroyCaret;
+  if Assigned(FOnExit) then
+    FOnExit(Self);
 end;
 
 procedure TSynHotKey.WMSetFocus(var Msg: TWMSetFocus);
@@ -1724,6 +1738,8 @@ procedure TSynHotKey.WMSetFocus(var Msg: TWMSetFocus);
   CreateCaret(Handle, 0, 1, -Canvas.Font.Height + 2);
   SetCaretPos(BorderWidth + 1 + TextWidth(Canvas, Text), BorderWidth + 1);
   ShowCaret(Handle);
+  if Assigned(FOnEnter) then
+    FOnEnter(Self);
 end;
 {$ENDIF}
 

diff --git a/components/synedit/Source/SynEditReg.pas b/components/synedit/Source/SynEditReg.pas
@@ -255,7 +255,7 @@ procedure Register;
     TSynExporterTeX, TSynEditPythonBehaviour, TSynMultiSyn,
     TSynCompletionProposal, TSynAutoComplete, TSynMacroRecorder,
     TSynEditPrint, TSynEditPrintPreview, TSynAutoCorrect,
-    TSynEditSearch, TSynEditRegexSearch, TSynEditOptionsDialog, TSynURIOpener,
+    TSynEditSearch, TSynEditRegexSearch, TSynEditOptionsDialog, TSynURIOpener, TSynHotKey,
     TSynEditDocumentManager]);
 {$IFDEF SYN_COMPILER_4_UP}
   RegisterComponents(SYNS_ComponentsPage, [TSynHighlighterManager]);