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

Qt: fixed bug where TQtCustomControl.getClientBounds() wasn't correct while resizing during load.

Browse Source 
git-svn-id: trunk@25078 -
This commit is contained in:
zeljko 2010-04-30 08:51:38 +00:00
parent 798bfa1b72
commit 54ed60ed5d
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,6 +373,7 @@ type
FFrameOnlyAroundContents: Boolean;
FCornerWidget: TQtWidget;
FViewPortWidget: TQtViewPort;
FResizing: Boolean; // guarantees clientRect in sync
protected
function CreateWidget(const AParams: TCreateParams):QWidgetH; override;
public
@ -10473,6 +10474,7 @@ begin
{$endif}
FHasPaint := True;
FViewPortWidget := nil;
FResizing := False;
if AParams.WndParent <> 0 then
Parent := TQtWidget(AParams.WndParent).GetContainerWidget
else
@ -10523,6 +10525,11 @@ begin
(ClassType = TQtCustomControl) then
Result := False
else
if QEvent_type(Event) = QEventResize then
begin
FResizing := True; // be sure that getClientBounds returns correct
Result := inherited EventFilter(Sender, Event);
end else
if QEvent_type(Event) = QEventWheel then
begin
if not horizontalScrollBar.getVisible and not verticalScrollBar.getVisible then
@ -10568,6 +10575,8 @@ begin
QEventPaint:
begin
retval^ := True;
if FResizing and (QEvent_type(Event) = QEventResize) then
FResizing := False;
viewport.EventFilter(viewport.Widget, Event);
QEvent_ignore(Event);
end;
@ -10664,7 +10673,19 @@ end;
function TQtCustomControl.getClientBounds: TRect;
begin
QWidget_rect(viewportWidget, @Result);
if FResizing then
begin
QWidget_contentsRect(Widget, @Result);
if not FFrameOnlyAroundContents then
begin
if (verticalScrollBar.getVisibleTo(Widget)) then
dec(Result.Right, verticalScrollBar.getWidth);
if (horizontalScrollBar.getVisibleTo(Widget)) then
dec(Result.Bottom, horizontalScrollBar.getHeight);
end;
end else
QWidget_rect(viewportWidget, @Result);
end;
procedure TQtCustomControl.grabMouse;