Changeset 303 for branches/highdpi/Packages/DpiControls/UDpiControls.pas

Timestamp:

Mar 9, 2021, 9:19:49 AM (3 years ago)

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

File:

• branches/highdpi/Packages/DpiControls/UDpiControls.pas (modified) (6 diffs)

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -47 +47 @@
   public
     property BorderStyle;
+    property OnKeyDown;
   end;
 
@@ -415 +416 @@
   TDpiWinControl = class(TDpiControl)
   private
+    FOnKeyDown: TKeyEvent;
     function GetBorderStyle: TBorderStyle;
     function GetHandle: HWND;
@@ -429 +431 @@
     procedure SetTabOrder(AValue: TTabOrder);
     procedure SetTabStop(AValue: Boolean);
+    procedure KeyDownHandler(Sender: TObject; var Key: Word; Shift: TShiftState);
   protected
+    procedure UpdateNativeControl; override;
     function GetNativeControl: TControl; override;
     function GetNativeWinControl: TWinControl; virtual;
     property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
+    procedure KeyDown(var Key: Word; Shift: TShiftState); virtual;
   public
     Controls: TDpiControls;
@@ -443 +448 @@
     property TabOrder: TTabOrder read GetTabOrder write SetTabOrder default -1;
     property TabStop: Boolean read GetTabStop write SetTabStop default False;
-    property OnKeyDown: TKeyEvent read GetOnKeyDown write SetOnKeyDown;
+    property OnKeyDown: TKeyEvent read FOnKeyDown write FOnKeyDown;
     property OnKeyPress: TKeyPressEvent read GetOnKeyPress write SetOnKeyPress;
     property OnKeyUp: TKeyEvent read GetOnKeyUp write SetOnKeyUp;
@@ -2911 +2916 @@
 end;
 
+procedure TDpiWinControl.KeyDownHandler(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  KeyDown(Key, Shift);
+  if Assigned(FOnKeyDown) then FOnKeyDown(Self, Key, Shift);
+end;
+
+procedure TDpiWinControl.UpdateNativeControl;
+begin
+  inherited;
+  GetNativeWinControl.OnKeyDown := @KeyDownHandler;
+end;
+
 function TDpiWinControl.GetNativeControl: TControl;
 begin
@@ -2919 +2937 @@
 begin
   Result := nil;
+end;
+
+procedure TDpiWinControl.KeyDown(var Key: Word; Shift: TShiftState);
+begin
 end;