Changeset 271

Timestamp:

Jun 30, 2020, 5:02:02 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Modal dialogs closure.
• Fixed: DpiScreen.ActiveForm tracks history of previously active forms.

File:

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

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -786 +786 @@
     // TScreen
     FDpi: Integer;
-    FActiveFormPrev: TDpiForm;
     FActiveForm: TDpiForm;
     FPrevActiveForms: TDpiForms;
@@ -3001 +3000 @@
 begin
   FForms.Remove(AForm);
+  FPrevActiveForms.Remove(AForm);
   if AForm = FActiveForm then begin
-    FActiveFormPrev := FActiveForm;
     FActiveForm := nil;
   end;
@@ -3738 +3737 @@
 procedure TDpiForm.ActivateHandler(Sender: TObject);
 begin
-  DpiScreen.FActiveFormPrev := DpiScreen.FActiveForm;
+  if Assigned(DpiScreen.FActiveForm) then begin
+    if DpiScreen.FPrevActiveForms.IndexOf(DpiScreen.FActiveForm) <> - 1 then
+      DpiScreen.FPrevActiveForms.Remove(DpiScreen.FActiveForm);
+    DpiScreen.FPrevActiveForms.Add(DpiScreen.FActiveForm);
+  end;
   DpiScreen.FActiveForm := Self;
   if Assigned(FOnActivate) then FOnActivate(Sender);
@@ -3745 +3748 @@
 procedure TDpiForm.DeactivateHandler(Sender: TObject);
 begin
-  DpiScreen.FActiveForm := DpiScreen.FActiveFormPrev;
+  if DpiScreen.FPrevActiveForms.Count > 0 then begin
+    DpiScreen.FActiveForm := DpiScreen.FPrevActiveForms.Last;
+    DpiScreen.FPrevActiveForms.Delete(DpiScreen.FPrevActiveForms.Count - 1);
+  end else DpiScreen.FActiveForm := nil;
   //DpiScreen.UpdateActiveFormFromNativeScreen;
   if Assigned(FOnDeactivate) then FOnDeactivate(Sender);
@@ -3827 +3833 @@
   IsMainForm: Boolean;
 begin
-  if fsModal in FormState then
+  if (fsModal in FormState) and (ModalResult = 0) then
     ModalResult := mrCancel
   else