Changeset 846 for trunk/src/gui/widgets/qscrollarea.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qscrollarea.cpp (modified) (4 diffs)

trunk/src/gui/widgets/qscrollarea.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -122 +122 @@
     If a scroll area is used to display the contents of a widget that
     contains child widgets arranged in a layout, it is important to
-    realise that the size policy of the layout will also determine the
+    realize that the size policy of the layout will also determine the
     size of the widget. This is especially useful to know if you intend
     to dynamically change the contents of the layout. In such cases,
@@ -483 +483 @@
     else if (focusRect.right() > visibleRect.right())
         d->hbar->setValue(focusRect.right() - d->viewport->width());
-    else
+    else if (focusRect.left() < visibleRect.left())
         d->hbar->setValue(focusRect.left());
 
@@ -490 +490 @@
     else if (focusRect.bottom() > visibleRect.bottom())
         d->vbar->setValue(focusRect.bottom() - d->viewport->height());
-    else
+    else if (focusRect.top() < visibleRect.top())
         d->vbar->setValue(focusRect.top());
 }