diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-06-10 23:30:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-11 09:35:16 +0000 |
| commit | 2b5bb740d2386453d2eb079f5676d97700a96230 (patch) | |
| tree | e8eec7c55b18ec808b56f186ee8ca3f8ecdf8eee | |
| parent | 8856f4bf82c9d95b2023ce51b1fcb19e114ba888 (diff) | |
macOS: close visible gap between tab bar base line and tabs
Dock widgets enable the QTabBar::drawBase property, but the clip region
left a gap of 3 pixels on each side between the base line and the tabs.
Correct the size of the hole cut into the clip region accordingly.
Visually tested on macOS 10.15.7 and macOS 11.2.1 using the dockwidgets
and tabdialog example.
As a drive-by, fix a spelling mistake in related documentation.
Fixes: QTBUG-86362
Change-Id: Iada027999467741d0590576ee4508e6f41fb056d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit f5d6f8dca0c45f311b19731128a495392884ec8c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 54e40945af..62d58bca25 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -3036,7 +3036,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai } #if QT_CONFIG(tabwidget) QRegion region(tbb->rect); - region -= tbb->tabBarRect; + region -= tbb->tabBarRect.adjusted(3, 0, -3, 0); p->save(); p->setClipRegion(region); QStyleOptionTabWidgetFrame twf; diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 1ee28e4331..f1cfbfe005 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -919,7 +919,7 @@ void QTabBar::setShape(Shape shape) \property QTabBar::drawBase \brief defines whether or not tab bar should draw its base. - If true then QTabBar draws a base in relation to the styles overlab. + If true then QTabBar draws a base in relation to the styles overlap. Otherwise only the tabs are drawn. \sa QStyle::pixelMetric(), QStyle::PM_TabBarBaseOverlap, QStyleOptionTabBarBase |