paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 07:30:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: make TCustomForm.Hide delphi compatibile, also allow hiding of modal form.issue #15390

Browse Source 
git-svn-id: trunk@35533 -
This commit is contained in:
zeljko 2012-02-21 12:26:22 +00:00
parent 3c600e2263
commit f3e517d1e2
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lcl/include/customform.inc
View File

@ -2091,8 +2091,6 @@ end;
------------------------------------------------------------------------------}
procedure TCustomForm.Hide;
begin
if (fsModal in FormState) and (ModalResult = 0) then
ModalResult := mrCancel;
Visible := False;
end;
@ -2675,11 +2673,30 @@ begin
Result := TWSCustomFormClass(WidgetSetClass).GetMDIChildren(Self, AIndex);
end;
{------------------------------------------------------------------------------
TCustomForm ShowModal
------------------------------------------------------------------------------}
function TCustomForm.ShowModal: Integer;
function HasVisibleForms: Boolean;
var
i: integer;
AForm: TCustomForm;
begin
Result := False;
for i := 0 to Screen.CustomFormZOrderCount - 1 do
begin
AForm := Screen.CustomFormsZOrdered[i];
if (AForm <> Self) and not (AForm.FormStyle = fsMDIChild) and
(AForm.Parent = nil) and AForm.Visible and AForm.HandleAllocated then
begin
Result := True;
break;
end;
end;
end;
procedure RaiseShowModalImpossible;
var
s: String;
@ -2773,6 +2790,21 @@ begin
CloseModal;
if ModalResult<>0 then break;
end;
// When modal form is hidden via TCustomForm.Hide then
// really hide it and keep it alive. issue #15390
if not Application.Terminated and
(ModalResult = 0) and not Visible then
begin
DebugLn('TCustomForm.ShowModal: *********** modal form invisible in loop ',dbgsName(Self));
ModalResult := mrCancel;
// CloseModal; do not process CloseModal stuff,
// it can trigger OnCloseQuery and that's not our intention
// since we are here because programmer called Hide of modal form.
Application.Idle(HasVisibleForms);
break;
end;
Application.Idle(true);
until False;
@ -2784,6 +2816,10 @@ begin
Screen.EnableForms(DisabledList);
{ guarantee execution of widgetset CloseModal }
TWSCustomFormClass(WidgetSetClass).CloseModal(Self);
// set our modalresult to mrCancel before hiding.
if ModalResult = 0 then
ModalResult := mrCancel;
Hide;
end;
finally