From 1ff8e0efb50cc55caa995fdb21889a24ec0063e0 Mon Sep 17 00:00:00 2001 From: zeljko Date: Mon, 7 Mar 2016 09:00:33 +0000 Subject: [PATCH] Qt: proper size initialization when using QtUseAccurateFrame define. git-svn-id: trunk@51839 - --- lcl/interfaces/qt/qtwidgets.pas | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas index 4c2f4ec314..7531fa25c0 100644 --- a/lcl/interfaces/qt/qtwidgets.pas +++ b/lcl/interfaces/qt/qtwidgets.pas @@ -2052,6 +2052,17 @@ begin move(FParams.X, FParams.Y); if GetContainerWidget <> Widget then QWidget_resize(GetContainerWidget, FParams.Width, FParams.Height); + + {$IFDEF QTUSEACCURATEFRAME} + if IsFramedWidget then + begin + {$IFDEF DEBUGQTUSEACCURATEFRAME} + DebugLn(Format('TQtWidget.InitializeWidget: proposed width %d height %d',[FParams.Width, FParams.Height]),' WSFrame=',dbgs(QtWidgetSet.WSFrameMargins),' FFrame=',dbgs(FFrameMargins)); + {$ENDIF} + if (QtWidgetSet.WSFrameMargins.Top > 0) then + FFrameMargins := QtWidgetSet.WSFrameMargins; + end; + {$ENDIF} Resize(FParams.Width, FParams.Height); FScrollX := 0;