paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-14 14:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: GTK2: Revert 56831 #eee0b37745 to 56834 as it open new issues.

Browse Source 
git-svn-id: trunk@56835 -
This commit is contained in:
michl 2017-12-23 21:53:36 +00:00
parent 630f7a6594
commit 5bbd6ad7f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/gtk2/gtk2wsforms.pp
View File

@ -706,15 +706,15 @@ var
(AForm.Parent = nil) and
(AForm.FormStyle <> fsMDIChild) and
(ModalWindows <> nil) and (ModalWindows.Count > 0) and
(AForm.BorderStyle in [bsDialog, bsSingle, bsSizeable, bsSizeToolWin, bsToolWindow]) then
not (AForm.FormStyle in fsAllStayOnTop) and
(AForm.BorderStyle in [bsDialog, bsSingle, bsSizeable]) and
(AForm.PopupParent = nil) and (AForm.PopupMode = pmNone) then
begin
AWindow := {%H-}PGtkWindow(AForm.Handle);
gtk_window_set_modal(AWindow, True);
// lcl_nonmodal_over_modal is needed to track nonmodal form
// created and shown when we have active modal forms
g_object_set_data(PGObject(AWindow),'lcl_nonmodal_over_modal', AForm);
if (AForm.PopupMode <> pmNone) and (AForm.PopupParent <> nil) then
gtk_window_set_transient_for(AWindow, PGtkWindow(AForm.Handle));
Result := True;
end;
end;