From a373c25fb82f8c86bf02c6430f0b8a53fa232d2a Mon Sep 17 00:00:00 2001
From: zeljko <zeljko@lazarus-ide.org>
Date: Sat, 28 Aug 2010 16:46:34 +0000
Subject: [PATCH] Qt: return scrollarea widget instead of viewport contentsrect
 in case of pending resizeevent.

git-svn-id: trunk@27224 -
---
 lcl/interfaces/qt/qtwidgets.pas | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas
index 4a8d8e8190..f5f988aa35 100644
--- a/lcl/interfaces/qt/qtwidgets.pas
+++ b/lcl/interfaces/qt/qtwidgets.pas
@@ -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