Changeset 303 for branches/highdpi/Packages/CevoComponents/DrawDlg.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

File:

• branches/highdpi/Packages/CevoComponents/DrawDlg.pas (modified) (5 diffs)

branches/highdpi/Packages/CevoComponents/DrawDlg.pas

@@ -18 +18 @@
     MoveActive: Boolean;
     procedure VisibleChangedHandler(Sender: TObject);
+    procedure DoDeactivate(Sender: TObject);
   protected
     TitleHeight: Integer;
@@ -29 +30 @@
     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;
@@ -71 +73 @@
   MoveActive := False;
   AddHandlerOnVisibleChanged(VisibleChangedHandler);
+  {$IFDEF LINUX}
+  OnDeactivate := DoDeactivate;
+  {$ENDIF}
 end;
 
@@ -76 +81 @@
 begin
   RemoveHandlerOnVisibleChanged(VisibleChangedHandler);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -171 +176 @@
 end;
 
+procedure TDrawDlg.KeyDown(var Key: Word; Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then Close;
+  inherited;
+end;
+
 procedure TDrawDlg.VisibleChangedHandler(Sender: TObject);
+begin
+  MoveActive := False;
+end;
+
+procedure TDrawDlg.DoDeactivate(Sender: TObject);
 begin
   MoveActive := False;