From 96b40a914a9ef7ae56c77062ff8197e372d7464b Mon Sep 17 00:00:00 2001 From: zeljko Date: Sat, 4 Aug 2012 10:45:38 +0000 Subject: [PATCH] Qt: allow showin modal form with borderStyle=bsNone. issue #22568 git-svn-id: trunk@38148 - --- lcl/interfaces/qt/qtwsforms.pp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lcl/interfaces/qt/qtwsforms.pp b/lcl/interfaces/qt/qtwsforms.pp index 523db91d42..aac2786b6a 100644 --- a/lcl/interfaces/qt/qtwsforms.pp +++ b/lcl/interfaces/qt/qtwsforms.pp @@ -443,12 +443,15 @@ begin QWidget_setParent(Widget.Widget, QApplication_desktop()); {$endif} - QWidget_setWindowFlags(Widget.Widget, QtDialog or - {$ifdef darwin} - QtWindowSystemMenuHint or - {$endif} - GetQtBorderIcons(TCustomForm(AWinControl).BorderStyle, - TCustomForm(AWinControl).BorderIcons)); + if TCustomForm(AWinControl).BorderStyle <> bsNone then + begin + QWidget_setWindowFlags(Widget.Widget, QtDialog or + {$ifdef darwin} + QtWindowSystemMenuHint or + {$endif} + GetQtBorderIcons(TCustomForm(AWinControl).BorderStyle, + TCustomForm(AWinControl).BorderIcons)); + end; Widget.setWindowModality(QtApplicationModal); end;