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

Qt: return scrollarea widget instead of viewport contentsrect in case of pending resizeevent.

Browse Source 
git-svn-id: trunk@27224 -
This commit is contained in:
zeljko 2010-08-28 16:46:34 +00:00
parent a2dbfa6442
commit a373c25fb8
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8292,11 +8292,6 @@ begin
{eat mouse button events when we are TListView class.
Such events are handled by itemViewportEventFilter.}
else
if (QEvent_type(Event) = QEventShow) then
begin
LCLObject.DoAdjustClientRectChange;
Result:=inherited EventFilter(Sender, Event);
end else
Result:=inherited EventFilter(Sender, Event);
end;
end;
@ -11011,8 +11006,30 @@ begin
end;
function TQtAbstractScrollArea.getClientBounds: TRect;
var
Area: QAbstractScrollAreaH;
W: QWidgetH;
begin
QWidget_rect(viewportWidget, @Result);
W := viewportWidget;
if getVisible and not QWidget_testAttribute(W, QtWA_PendingResizeEvent) then
QWidget_rect(viewportWidget, @Result)
else
begin
QWidget_contentsRect(Widget, @Result);
if (QStyle_styleHint(QApplication_style(),
QStyleSH_ScrollView_FrameOnlyAroundContents) <= 0) then
begin
Area := QAbstractScrollAreaH(Widget);
W := QAbstractScrollArea_verticalScrollBar(Area);
if QWidget_isVisibleTo(W, Widget) then
dec(Result.Right, QWidget_width(W));
W := QAbstractScrollArea_horizontalScrollBar(Area);
if QWidget_isVisibleTo(W, Widget) then
dec(Result.Bottom, QWidget_height(W));
end;
end;
end;
function TQtAbstractScrollArea.getViewOrigin: TPoint;
@ -11427,7 +11444,8 @@ function TQtCustomControl.getClientBounds: TRect;
var
HaveBar: Boolean;
begin
if FResizing then
if FResizing or
QWidget_testAttribute(viewportWidget, QtWA_PendingResizeEvent) then
begin
QWidget_contentsRect(Widget, @Result);
if not FFrameOnlyAroundContents then