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

Qt: rework fixes for metacity like wm's. Now marco and gnome shell are mapped as metacity.

Browse Source 
git-svn-id: trunk@41347 -
This commit is contained in:
zeljko 2013-05-22 08:41:02 +00:00
parent 919ce9cbea
commit 37d130d8ed
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/interfaces/qt/qtobject.inc
View File

@ -107,6 +107,9 @@ begin
((QtVersionMajor = 4) and (QtVersionMinor < 6)) or IsOldKDEInstallation then ((QtVersionMajor = 4) and (QtVersionMinor < 6)) or IsOldKDEInstallation then
QtX11InitializePalettes; QtX11InitializePalettes;
FWindowManagerName := LowerCase(GetWindowManager); FWindowManagerName := LowerCase(GetWindowManager);
// metacity wm forks. marco = mint mate wm, gnome shell = gnome 3 wm
if (FWindowManagerName = 'marco') or (FWindowManagerName = 'gnome shell') then
FWindowManagerName := 'metacity';
{$ENDIF} {$ENDIF}
{$IFDEF DARWIN} {$IFDEF DARWIN}
// do not swap meta and ctrl keys, issue #20897 // do not swap meta and ctrl keys, issue #20897

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

@ -6108,9 +6108,7 @@ begin
end else end else
if not QWidget_isModal(Widget) then if not QWidget_isModal(Widget) then
begin begin
if ((QtWidgetSet.WindowManagerName = 'metacity') or if (QtWidgetSet.WindowManagerName = 'metacity') and not IsMDIChild then
(QtWidgetSet.WindowManagerName = 'marco')) and
not IsMDIChild then
X11Raise(QWidget_winID(Widget)) X11Raise(QWidget_winID(Widget))
else else
QWidget_raise(Widget); QWidget_raise(Widget);
@ -17027,7 +17025,7 @@ begin
QWidget_show(Widget); QWidget_show(Widget);
{$IFDEF HASX11} {$IFDEF HASX11}
if (QtWidgetSet.WindowManagerName = 'metacity') or (QtWidgetSet.WindowManagerName = 'marco') then if (QtWidgetSet.WindowManagerName = 'metacity') then
X11Raise(QWidget_winID(Widget)); X11Raise(QWidget_winID(Widget));
{$ENDIF} {$ENDIF}

2
lcl/interfaces/qt/qtwinapi.inc
View File

@ -5683,7 +5683,7 @@ var
W: QWidgetH; W: QWidgetH;
begin begin
{$IFDEF HASX11} {$IFDEF HASX11}
if (WindowManagerName = 'metacity') or (WindowManagerName = 'marco') then if WindowManagerName = 'metacity' then
W := X11GetActivewindow W := X11GetActivewindow
else else
W := QApplication_activeWindow(); W := QApplication_activeWindow();

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

@ -422,8 +422,7 @@ begin
{$ifdef HASX11} {$ifdef HASX11}
if ((QtWidgetSet.WindowManagerName = 'kwin') and IsOldKDEInstallation) or if ((QtWidgetSet.WindowManagerName = 'kwin') and IsOldKDEInstallation) or
(QtWidgetSet.WindowManagerName = 'xfwm4') or (QtWidgetSet.WindowManagerName = 'xfwm4') or
(QtWidgetSet.WindowManagerName = 'metacity') or (QtWidgetSet.WindowManagerName = 'metacity') then
(QtWidgetSet.WindowManagerName = 'marco') then
begin begin
W := nil; W := nil;
ActiveWin := GetActiveWindow; ActiveWin := GetActiveWindow;
@ -538,7 +537,7 @@ begin
SetSkipX11Taskbar(Widget.Widget, True); SetSkipX11Taskbar(Widget.Widget, True);
Widget.setShowInTaskBar(False); Widget.setShowInTaskBar(False);
end; end;
if (QtWidgetSet.WindowManagerName = 'metacity') or (QtWidgetSet.WindowManagerName = 'marco') then if (QtWidgetSet.WindowManagerName = 'metacity') then
X11Raise(QWidget_winID(Widget.Widget)); X11Raise(QWidget_winID(Widget.Widget));
end else end else
if (TForm(AWinControl).FormStyle = fsSplash) then if (TForm(AWinControl).FormStyle = fsSplash) then