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

lcl: clean up

Browse Source 
git-svn-id: trunk@46957 -
This commit is contained in:
mattias 2014-11-22 09:52:32 +00:00
parent 04501e7e80
commit 1b53795b1b
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
{ $Id$}
{ {
***************************************************************************** *****************************************************************************
* Gtk2WSForms.pp * * Gtk2WSForms.pp *
@ -743,13 +742,12 @@ begin
and (ModalWindows <> nil) and (ModalWindows.Count > 0) and (ModalWindows <> nil) and (ModalWindows.Count > 0)
and (AForm.PopupParent = nil) and (AForm.BorderStyle = bsNone) and (AForm.PopupParent = nil) and (AForm.BorderStyle = bsNone)
then begin then begin
// showing a non modal form above a modal form // showing a non modal form with bsNone above a modal form
gtk_window_set_transient_for(GtkWindow, nil); gtk_window_set_transient_for(GtkWindow, nil);
gtk_window_set_modal(GtkWindow, True); gtk_window_set_modal(GtkWindow, True);
end else begin end else begin
// showing normal form // hiding/showing normal form
// clear former mods (e.g. when a modal form becomes a normal form) // clear former mods, e.g. when a modal form becomes a normal form, see bug 23876
// see bug 23876
gtk_window_set_transient_for(GtkWindow, nil); //untransient gtk_window_set_transient_for(GtkWindow, nil); //untransient
gtk_window_set_modal(GtkWindow, False); gtk_window_set_modal(GtkWindow, False);
end; end;
@ -758,11 +756,11 @@ begin
// issue #26018 // issue #26018
if AWinControl.HandleObjectShouldBeVisible and if AWinControl.HandleObjectShouldBeVisible and
not (csDesigning in AForm.ComponentState) and not (csDesigning in AForm.ComponentState) and
not (TCustomForm(AWinControl).FormStyle in fsAllStayOnTop) and not (AForm.FormStyle in fsAllStayOnTop) and
not (fsModal in TCustomForm(AWinControl).FormState) and not (fsModal in AForm.FormState) and
(TCustomForm(AWinControl).PopupMode = pmAuto) and (AForm.PopupMode = pmAuto) and
(TCustomForm(AWinControl).BorderStyle = bsNone) and (AForm.BorderStyle = bsNone) and
(TCustomForm(AWinControl).PopupParent = nil) then (AForm.PopupParent = nil) then
begin begin
TempGdkWindow := {%H-}PGdkWindow(Gtk2WidgetSet.GetForegroundWindow); TempGdkWindow := {%H-}PGdkWindow(Gtk2WidgetSet.GetForegroundWindow);
if (TempGdkWindow <> nil) and (GdkWindowObject_modal_hint(GDK_WINDOW_OBJECT(TempGdkWindow)^) = 0) then if (TempGdkWindow <> nil) and (GdkWindowObject_modal_hint(GDK_WINDOW_OBJECT(TempGdkWindow)^) = 0) then