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

Qt5: Fixed showing of popup window over modal form. eg TDateTimePicker calendar.

Browse Source 
git-svn-id: trunk@59714 -
This commit is contained in:
zeljko 2018-12-02 14:13:10 +00:00
parent 40a8d09984
commit d8dd2565cf
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/interfaces/qt5/qtwsforms.pp
View File

@ -428,6 +428,9 @@ var
var
AForm: TCustomForm;
AWidget: QWidgetH;
{$IFDEF DARWIN}
AFlag: Cardinal;
{$ENDIF}
begin
Result := False;
AForm := TCustomForm(AWinControl);
@ -437,15 +440,25 @@ var
not (AForm.FormStyle in fsAllStayOnTop) and
(AForm.Parent = nil) and
(QApplication_activeModalWidget() <> nil) and
{$IFDEF DARWIN}
not Assigned(AForm.PopupParent) then
{$ELSE}
(AForm.BorderStyle in [bsDialog, bsSingle, bsSizeable]) and
(AForm.PopupParent = nil) and (AForm.PopupMode = pmNone) then
{$ENDIF}
begin
AWidget := TQtWidget(AForm.Handle).Widget;
{$IFDEF DARWIN}
QWidget_setParent(AWidget, QApplication_activeWindow());
QWidget_setWindowFlags(Widget.Widget, QtSheet or
GetQtBorderIcons(TCustomForm(AWinControl).BorderStyle,
TCustomForm(AWinControl).BorderIcons));
if AForm.BorderStyle = bsNone then
begin
SetCapture(0);
AFlag := QtPopup;
end else
AFlag := QtSheet;
AFlag := AFlag or GetQtBorderIcons(TCustomForm(AWinControl).BorderStyle,
TCustomForm(AWinControl).BorderIcons);
QWidget_setWindowFlags(Widget.Widget, AFlag);
{$ELSE}
QWidget_setParent(AWidget, QApplication_desktop());
{$IFDEF MSWINDOWS}