Changeset 257 for trunk

Timestamp:

Jun 10, 2020, 9:47:11 PM (4 years ago)

Author:

chronos

Message:

• Modified: Allow to close windows by Escape key.

Location:

trunk

Files:

• LocalPlayer/Enhance.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (2 diffs)
• Packages/CevoComponents/DrawDlg.pas (modified) (2 diffs)

trunk/LocalPlayer/Enhance.pas

@@ -366 +366 @@
   Shift: TShiftState);
 begin
-  if Key = VK_ESCAPE then
-    Close
-  else if Key = VK_F1 then
+  if Key = VK_F1 then
     HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
       HelpDlg.TextIndex('MACRO'))

trunk/LocalPlayer/TechTree.pas

@@ -23 +23 @@
       Shift: TShiftState; X, Y: Integer);
     procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
-    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure CloseBtnClick(Sender: TObject);
   private
@@ -228 +227 @@
 end;
 
-procedure TTechTreeDlg.FormKeyDown(Sender: TObject; var Key: Word;
-  Shift: TShiftState);
-begin
-  if Key = VK_ESCAPE then
-    Close;
-end;
-
 procedure TTechTreeDlg.CloseBtnClick(Sender: TObject);
 begin

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -29 +29 @@
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
     procedure MouseLeave; override;
+    procedure KeyDown(var Key: Word; Shift: TShiftState); override;
   public
     constructor Create(AOwner: TComponent); override;
@@ -171 +172 @@
 end;
 
+procedure TDrawDlg.KeyDown(var Key: Word; Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then Close;
+  inherited KeyDown(Key, Shift);
+end;
+
 procedure TDrawDlg.VisibleChangedHandler(Sender: TObject);
 begin