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

Qt: FontDialog,ColorDialog workaround for buggy xfwm4 (xfce) modal windows handling.

Browse Source 
git-svn-id: trunk@40624 -
This commit is contained in:
zeljko 2013-03-23 17:47:54 +00:00
parent b6079827c4
commit 27f3ced09f
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lcl/interfaces/qt/qtwsdialogs.pp
View File

@ -680,6 +680,10 @@ var
ARgb: QRgb;
ReturnBool: Boolean;
ColorDialog: TColorDialog absolute ACommonDialog;
{$IFDEF HASX11}
AWND: HWND;
{$ENDIF}
procedure FillCustomColors;
var
@ -719,6 +723,14 @@ begin
ACommonDialog.UserChoice := mrOk
else
ACommonDialog.UserChoice := mrCancel;
{$IFDEF HASX11}
if (QtWidgetSet.WindowManagerName = 'xfwm4') and (QApplication_activeModalWidget() <> nil) then
begin
AWND := HwndFromWidgetH(QApplication_activeModalWidget());
if (AWND <> 0) and (X11GetActivewindow <> TQtWidget(AWND).Widget) then
X11Raise(QWidget_winID(TQtWidget(AWND).Widget));
end;
{$ENDIF}
end;
{ TQtWSFontDialog }
@ -739,6 +751,9 @@ var
ReturnFont, CurrentFont: QFontH;
ReturnBool: Boolean;
Str: WideString;
{$IFDEF HASX11}
AWND: HWND;
{$ENDIF}
begin
{------------------------------------------------------------------------------
Code to call the dialog
@ -785,6 +800,14 @@ begin
ACommonDialog.UserChoice := mrOk
else
ACommonDialog.UserChoice := mrCancel;
{$IFDEF HASX11}
if (QtWidgetSet.WindowManagerName = 'xfwm4') and (QApplication_activeModalWidget() <> nil) then
begin
AWND := HwndFromWidgetH(QApplication_activeModalWidget());
if (AWND <> 0) and (X11GetActivewindow <> TQtWidget(AWND).Widget) then
X11Raise(QWidget_winID(TQtWidget(AWND).Widget));
end;
{$ENDIF}
end;
end.