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

Qt: fixed maximized and fullscreen when using QtUseAccurateFrame, under non compositing window managers.

Browse Source 
git-svn-id: trunk@51917 -
This commit is contained in:
zeljko 2016-03-11 09:54:45 +00:00
parent 0c0db2477b
commit f6c0e626c2
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4006,6 +4006,13 @@ begin
// checking code above means that we have mismatch somewhere
// in between Qt and X11. Question is who is correct in this case X or Qt.
// SlotMove is triggered always after form activation
if (getWindowState and QtWindowFullScreen = QtWindowFullScreen) or
(getWindowState and QtWindowMaximized = QtWindowMaximized) then
begin
{$IF DEFINED(DEBUGQTUSEACCURATEFRAME) OR DEFINED(DEBUGQTCHECKMOVESIZE)}
DebugLn('WARNING: SlotMove(',dbgsName(LCLObject),') FULLSCREEN CALCULATED X=',dbgs(Msg.XPos),' Y=',dbgs(Msg.YPos));
{$ENDIF}
end else
if GetX11WindowRealized(QWidget_winID(Widget)) then
begin
{$IF DEFINED(DEBUGQTUSEACCURATEFRAME) OR DEFINED(DEBUGQTCHECKMOVESIZE)}
@ -7126,6 +7133,11 @@ begin
begin
ASize := GetSize;
AFrameSize := Result;
if (getWindowState and QtWindowMaximized = QtWindowMaximized) then
begin
Result.cx := ASize.cx;
Result.cy := ASize.cy + FFrameMargins.Top + FFrameMargins.Bottom;
end else
if (ASize.cx = AFrameSize.cx) and (ASize.cy = AFrameSize.cy) then
begin
{$IFDEF DebugQtUseAccurateFrame}
@ -7157,6 +7169,23 @@ begin
begin
QWidget_size(Widget, @ASize);
QWidget_frameSize(Widget, @AFrameSize);
if (getWindowState and QtWindowFullScreen = QtWindowFullScreen) then
begin
Result.Left := 0;
Result.Top := 0;
Result.Right := Screen.Width;
Result.Bottom := Screen.Height;
FFormHasInvalidPosition := False;
end else
if (getWindowState and QtWindowMaximized = QtWindowMaximized) then
begin
Result.Left := 0;
Result.Top := 0;
Result.Right := ASize.cx;
Result.Bottom := ASize.cy + FFrameMargins.Top + FFrameMargins.Bottom;
FFormHasInvalidPosition := False;
end else
if (ASize.cx = AFrameSize.cx) and (ASize.cy = AFrameSize.cy) then
begin
{$IFDEF DebugQtUseAccurateFrame}
@ -7450,7 +7479,7 @@ begin
if not IsMDIChild then
begin
{$IF DEFINED(QtUseAccurateFrame) AND DEFINED(HASX11)}
if IsFramedWidget then
if IsFramedWidget and not (getWindowState and QtWindowFullScreen = QtWindowFullScreen) then
begin
{This is Qt bug, so we must take care of it}
if GetX11WindowPos(QWidget_winID(Widget), R.Left, R.Top) then