diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-08 13:19:37 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-10 13:59:30 +0200 |
| commit | 033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b (patch) | |
| tree | af2e47a222cf6f4ed3687305df2d1cc3a578b2ed /src/widgets/widgets/qtabwidget.cpp | |
| parent | c0873b7832d8aaf79dda0c5c5820f97c84b399ed (diff) | |
QApplication: remove obsolete globalStrut functionality
Change-Id: If56873f86f5291264cac720f8db7dbd4db756f49
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/widgets/qtabwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qtabwidget.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index a19dacda52..8885610e26 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -904,8 +904,7 @@ QSize QTabWidget::sizeHint() const QSize sz = basicSize(d->pos == North || d->pos == South, lc, rc, s, t); - return style()->sizeFromContents(QStyle::CT_TabWidget, &opt, sz, this) - .expandedTo(QApplication::globalStrut()); + return style()->sizeFromContents(QStyle::CT_TabWidget, &opt, sz, this); } @@ -938,8 +937,7 @@ QSize QTabWidget::minimumSizeHint() const initStyleOption(&opt); opt.palette = palette(); opt.state = QStyle::State_None; - return style()->sizeFromContents(QStyle::CT_TabWidget, &opt, sz, this) - .expandedTo(QApplication::globalStrut()); + return style()->sizeFromContents(QStyle::CT_TabWidget, &opt, sz, this); } /*! @@ -953,8 +951,7 @@ int QTabWidget::heightForWidth(int width) const opt.state = QStyle::State_None; QSize zero(0,0); - const QSize padding = style()->sizeFromContents(QStyle::CT_TabWidget, &opt, zero, this) - .expandedTo(QApplication::globalStrut()); + const QSize padding = style()->sizeFromContents(QStyle::CT_TabWidget, &opt, zero, this); QSize lc(0, 0), rc(0, 0); if (d->leftCornerWidget) @@ -984,7 +981,7 @@ int QTabWidget::heightForWidth(int width) const QSize s(stackWidth, stackHeight); QSize contentSize = basicSize(tabIsHorizontal, lc, rc, s, t); - return (contentSize + padding).expandedTo(QApplication::globalStrut()).height(); + return (contentSize + padding).height(); } |