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

Qt: fixed bad behaviour of modal forms and TQtMessageBox under metacity window manager. issue #19507

Browse Source 
git-svn-id: trunk@31121 -
This commit is contained in:
zeljko 2011-06-06 16:33:11 +00:00
parent 779e0eea41
commit a452810bf5
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/qt/qtwidgets.pas
View File

@ -14251,6 +14251,12 @@ begin
{$ELSE} {$ELSE}
QMessageBox_setWindowModality(QMessageBoxH(Widget), QtApplicationModal); QMessageBox_setWindowModality(QMessageBoxH(Widget), QtApplicationModal);
QWidget_show(Widget); QWidget_show(Widget);
{$IFDEF HASX11}
if (QtWidgetSet.WindowManagerName = 'metacity') then
X11Raise(QWidget_winID(Widget));
{$ENDIF}
repeat repeat
QCoreApplication_processEvents(); QCoreApplication_processEvents();
Application.Idle(true); Application.Idle(true);

9
lcl/interfaces/qt/qtwsforms.pp
View File

@ -441,8 +441,17 @@ begin
end; end;
end; end;
end; end;
Widget.setVisible(AWinControl.HandleObjectShouldBeVisible); Widget.setVisible(AWinControl.HandleObjectShouldBeVisible);
Widget.EndUpdate; Widget.EndUpdate;
{$IFDEF HASX11}
if AWinControl.HandleObjectShouldBeVisible and
(fsModal in TForm(AWinControl).FormState) and
(QtWidgetSet.WindowManagerName = 'metacity') then
X11Raise(QWidget_winID(Widget.Widget));
{$ENDIF}
{$IFDEF HASX11} {$IFDEF HASX11}
if (QtVersionMajor = 4) and (QtVersionMinor >= 6) if (QtVersionMajor = 4) and (QtVersionMinor >= 6)
and (TForm(AWinControl).FormStyle <> fsMDIChild) then and (TForm(AWinControl).FormStyle <> fsMDIChild) then