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

Qt: workaround for Qt bug on X11 where x and y of form are not in sync with real X11 position.

Browse Source 
git-svn-id: trunk@51843 -
This commit is contained in:
zeljko 2016-03-07 12:09:43 +00:00
parent 1363a537c0
commit bdb7f2d033
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,6 +638,9 @@ type
FShowOnTaskBar: Boolean;
FPopupParent: QWidgetH;
FMDIStateHook: QMdiSubWindow_hookH;
{$IFDEF QtUseAccurateFrame}
FFormHasInvalidPosition: boolean;
{$ENDIF}
protected
function CreateWidget(const {%H-}AParams: TCreateParams):QWidgetH; override;
procedure ChangeParent(NewParent: QWidgetH);
@ -6746,6 +6749,9 @@ begin
{$ifdef VerboseQt}
WriteLn('TQtMainWindow.CreateWidget Name: ', LCLObject.Name);
{$endif}
{$IFDEF QtUseAccurateFrame}
FFormHasInvalidPosition := False;
{$ENDIF}
FBlocked := False;
FShowOnTaskBar := False;
QtFormBorderStyle := Ord(bsSizeable);
@ -7028,9 +7034,7 @@ begin
dec(Result.Bottom, FFrameMargins.Bottom + FFrameMargins.Top);
{menubar is not yet allocated, so use SM_CYMENU}
if Assigned(TCustomForm(LCLObject).Menu) then
begin
dec(Result.Bottom, QtWidgetSet.GetSystemMetrics(SM_CYMENU));
end;
{$ENDIF}
{$IFDEF DEBUGQTUSEACCURATEFRAME}
DebugLn('<TQtMainWindow.getClientBounds(',dbgsName(LCLObject),'): ***ERROR*** NEW RESULT=',dbgs(Result));
@ -7088,6 +7092,7 @@ function TQtMainWindow.getFrameGeometry: TRect;
{$IFDEF QtUseAccurateFrame}
var
ASize, AFrameSize: TSize;
X11X, X11Y, X, Y: integer;
{$ENDIF}
begin
Result:=inherited getFrameGeometry;
@ -7109,6 +7114,20 @@ begin
DebugLn('<TQtMainWindow.getFrameGeometry ',dbgs(Result),' WS W=',dbgs(Result.Right - Result.Left),' H=',dbgs(Result.Bottom - Result.Top),' SIZE=',dbgs(ASize));
{$ENDIF}
end;
if FFormHasInvalidPosition then
begin
if GetX11WindowPos(QWidget_winID(Widget), X11X, X11Y) then
begin
X11X -= FFrameMargins.Left;
X11Y -= FFrameMargins.Top;
X := Result.Left;
Y := Result.Top;
if (X11X = x) and (X11Y = y) then
FFormHasInvalidPosition := False
else
OffsetRect(Result, X11X - x, X11Y - y);
end;
end;
end;
{$ENDIF}
end;
@ -7328,6 +7347,14 @@ begin
{$IF DEFINED(QtUseAccurateFrame) AND DEFINED(HASX11)}
if IsFramedWidget then
begin
{This is Qt bug, so we must take care of it}
if GetX11WindowPos(QWidget_winID(Widget), R.Left, R.Top) then
begin
R.Left := R.Left - FFrameMargins.Left;
R.Top := R.Top - FFrameMargins.Top;
if (R.Left <> QWidget_x(Widget)) or (R.Top <> QWidget_y(Widget)) then
FFormHasInvalidPosition := True;
end;
R := QtWidgetSet.WSFrameMargins;
if (R.Left = 0) and (R.Top = 0) and (R.Bottom = 0) and (R.Right = 0) then
begin