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

Qt: fixed accurate frame creation under MSWindows, no need to realize form.

Browse Source 
git-svn-id: trunk@51872 -
This commit is contained in:
zeljko 2016-03-09 09:50:23 +00:00
parent c6f77b0dd8
commit 3a9bb5359a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1905,8 +1905,8 @@ begin
{$ENDIF} {$ENDIF}
QWidget_move(ATempWidget, -MAXSHORT, -MAXSHORT); QWidget_move(ATempWidget, -MAXSHORT, -MAXSHORT);
QWidget_resize(ATempWidget, 32, 32); QWidget_resize(ATempWidget, 32, 32);
QWidget_show(ATempWidget);
{$IFDEF HASX11} {$IFDEF HASX11}
QWidget_show(ATempWidget);
AID := QWidget_winID(ATempWidget); AID := QWidget_winID(ATempWidget);
B := AskX11_NET_REQUEST_FRAME_EXTENTS(AID, R); B := AskX11_NET_REQUEST_FRAME_EXTENTS(AID, R);
@ -1977,7 +1977,8 @@ begin
{$ENDIF} {$ENDIF}
end; end;
{$ELSE} {$ELSE}
//TODO: create FWSFrameMargins from AFrameSize - ASize // create native window
QWidget_winId(ATempWidget);
QWidget_size(ATempWidget, @ASize); QWidget_size(ATempWidget, @ASize);
QWidget_frameSize(ATempWidget, @AFrameSize); QWidget_frameSize(ATempWidget, @AFrameSize);
R.Left := (AFrameSize.cx - ASize.cx) div 2; R.Left := (AFrameSize.cx - ASize.cx) div 2;
@ -1989,8 +1990,10 @@ begin
FWSFrameMargins := R; FWSFrameMargins := R;
{$IFDEF DebugQtUseAccurateFrame} {$IFDEF DebugQtUseAccurateFrame}
// just test // just test
{$IFDEF HASX11}
QWidget_size(ATempWidget, @ASize); QWidget_size(ATempWidget, @ASize);
QWidget_frameSize(ATempWidget, @AFrameSize); QWidget_frameSize(ATempWidget, @AFrameSize);
{$ENDIF}
with FWSFrameMargins do with FWSFrameMargins do
DebugLn('TQtWidgetSet.GetFrameMargins: **MARGINS=',Format('l %d t %d r %d b %d QtFrame x %d y %d compositor %s sysMetrics %d', DebugLn('TQtWidgetSet.GetFrameMargins: **MARGINS=',Format('l %d t %d r %d b %d QtFrame x %d y %d compositor %s sysMetrics %d',
[Left, Top, Right, Bottom, AFrameSize.cx - ASize.cx, AFrameSize.cy - ASize.cy, BoolToStr({$IFDEF HASX11}QX11Info_isCompositingManagerRunning{$ELSE}False{$ENDIF}), GetSystemMetrics(SM_CYCAPTION)])); [Left, Top, Right, Bottom, AFrameSize.cx - ASize.cx, AFrameSize.cy - ASize.cy, BoolToStr({$IFDEF HASX11}QX11Info_isCompositingManagerRunning{$ELSE}False{$ENDIF}), GetSystemMetrics(SM_CYCAPTION)]));