From d41834b953beb1a578cc1be8702dab9ac4a4c954 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Wed, 3 Dec 2014 12:58:14 +0100 Subject: QAbstractScrollArea: add a getter for the margins Strange API asymmetry that needed to be fixed. Task-number: QTBUG-8315 [ChangeLog][QtWidgets][QAbstractScrollArea] A getter for the viewport margins has been added. Change-Id: Ie1460b572206922031fc4effc2aa8261e25088b5 Reviewed-by: Joerg Bornemann --- src/widgets/widgets/qabstractscrollarea.cpp | 17 +++++++++++++++-- src/widgets/widgets/qabstractscrollarea.h | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'src/widgets/widgets') diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 4cafeafcec..bcf0bbe1fc 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -923,7 +923,7 @@ QWidgetList QAbstractScrollArea::scrollBarWidgets(Qt::Alignment alignment) they should not call this function. By default all margins are zero. - + \sa viewportMargins() */ void QAbstractScrollArea::setViewportMargins(int left, int top, int right, int bottom) { @@ -943,7 +943,7 @@ void QAbstractScrollArea::setViewportMargins(int left, int top, int right, int b area. By default all margins are zero. - + \sa viewportMargins() */ void QAbstractScrollArea::setViewportMargins(const QMargins &margins) { @@ -951,6 +951,19 @@ void QAbstractScrollArea::setViewportMargins(const QMargins &margins) margins.right(), margins.bottom()); } +/*! + \since 5.5 + Returns the margins around the scrolling area. + By default all the margins are zero. + + \sa setViewportMargins() +*/ +QMargins QAbstractScrollArea::viewportMargins() const +{ + Q_D(const QAbstractScrollArea); + return QMargins(d->left, d->top, d->right, d->bottom); +} + /*! \internal */ bool QAbstractScrollArea::eventFilter(QObject *o, QEvent *e) { diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index bd15ba8a52..6a9a86b07f 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -97,6 +97,7 @@ protected: QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget *parent = 0); void setViewportMargins(int left, int top, int right, int bottom); void setViewportMargins(const QMargins &margins); + QMargins viewportMargins() const; bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; bool event(QEvent *) Q_DECL_OVERRIDE; -- cgit v1.2.3