1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QTabWidget where corner widget space is not reclaimed

Browse Source 
When a corner widget in a QTabWidget is hidden then the space is not
reclaimed for the tabs. Check whether the corner widget is visible before
laying out the corner contents.

Fixes: QTBUG-18068
Change-Id: Ib07ad15a7317e37101dde87c6f80c91c6c4ac6d3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit c7a8cbd272b7ffce1d5da604881ed8f66a632444)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Qiang Li 2022-03-22 10:05:27 +08:00 committed by Qt Cherry-pick Bot
parent c29f10a0b0
commit 23a4952357
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/widgets/widgets/qtabwidget.cpp
View File

@ -296,7 +296,7 @@ void QTabWidget::initStyleOption(QStyleOptionTabWidgetFrame *option) const
} }
} }
if (d->rightCornerWidget) { if (d->rightCornerWidget && d->rightCornerWidget->isVisible()) {
const QSize rightCornerSizeHint = d->rightCornerWidget->sizeHint(); const QSize rightCornerSizeHint = d->rightCornerWidget->sizeHint();
const QSize bounds(rightCornerSizeHint.width(), t.height() - exth); const QSize bounds(rightCornerSizeHint.width(), t.height() - exth);
option->rightCornerWidgetSize = rightCornerSizeHint.boundedTo(bounds); option->rightCornerWidgetSize = rightCornerSizeHint.boundedTo(bounds);
@ -304,7 +304,7 @@ void QTabWidget::initStyleOption(QStyleOptionTabWidgetFrame *option) const
option->rightCornerWidgetSize = QSize(0, 0); option->rightCornerWidgetSize = QSize(0, 0);
} }
if (d->leftCornerWidget) { if (d->leftCornerWidget && d->leftCornerWidget->isVisible()) {
const QSize leftCornerSizeHint = d->leftCornerWidget->sizeHint(); const QSize leftCornerSizeHint = d->leftCornerWidget->sizeHint();
const QSize bounds(leftCornerSizeHint.width(), t.height() - exth); const QSize bounds(leftCornerSizeHint.width(), t.height() - exth);
option->leftCornerWidgetSize = leftCornerSizeHint.boundedTo(bounds); option->leftCornerWidgetSize = leftCornerSizeHint.boundedTo(bounds);
@ -808,9 +808,9 @@ void QTabWidget::setUpLayout(bool onlyCheck)
d->tabs->setGeometry(tabRect); d->tabs->setGeometry(tabRect);
d->stack->setGeometry(contentsRect); d->stack->setGeometry(contentsRect);
if (d->leftCornerWidget) if (d->leftCornerWidget && d->leftCornerWidget->isVisible())
d->leftCornerWidget->setGeometry(leftCornerRect); d->leftCornerWidget->setGeometry(leftCornerRect);
if (d->rightCornerWidget) if (d->rightCornerWidget && d->rightCornerWidget->isVisible())
d->rightCornerWidget->setGeometry(rightCornerRect); d->rightCornerWidget->setGeometry(rightCornerRect);
if (!onlyCheck) if (!onlyCheck)
@ -842,9 +842,9 @@ QSize QTabWidget::sizeHint() const
initStyleOption(&opt); initStyleOption(&opt);
opt.state = QStyle::State_None; opt.state = QStyle::State_None;
if (d->leftCornerWidget) if (d->leftCornerWidget && d->leftCornerWidget->isVisible())
lc = d->leftCornerWidget->sizeHint(); lc = d->leftCornerWidget->sizeHint();
if (d->rightCornerWidget) if (d->rightCornerWidget && d->rightCornerWidget->isVisible())
rc = d->rightCornerWidget->sizeHint(); rc = d->rightCornerWidget->sizeHint();
if (!d->dirty) { if (!d->dirty) {
QTabWidget *that = const_cast<QTabWidget*>(this); QTabWidget *that = const_cast<QTabWidget*>(this);
@ -882,9 +882,9 @@ QSize QTabWidget::minimumSizeHint() const
Q_D(const QTabWidget); Q_D(const QTabWidget);
QSize lc(0, 0), rc(0, 0); QSize lc(0, 0), rc(0, 0);
if (d->leftCornerWidget) if (d->leftCornerWidget && d->leftCornerWidget->isVisible())
lc = d->leftCornerWidget->minimumSizeHint(); lc = d->leftCornerWidget->minimumSizeHint();
if (d->rightCornerWidget) if (d->rightCornerWidget && d->rightCornerWidget->isVisible())
rc = d->rightCornerWidget->minimumSizeHint(); rc = d->rightCornerWidget->minimumSizeHint();
if (!d->dirty) { if (!d->dirty) {
QTabWidget *that = const_cast<QTabWidget*>(this); QTabWidget *that = const_cast<QTabWidget*>(this);
@ -918,9 +918,9 @@ int QTabWidget::heightForWidth(int width) const
const QSize padding = style()->sizeFromContents(QStyle::CT_TabWidget, &opt, zero, this); const QSize padding = style()->sizeFromContents(QStyle::CT_TabWidget, &opt, zero, this);
QSize lc(0, 0), rc(0, 0); QSize lc(0, 0), rc(0, 0);
if (d->leftCornerWidget) if (d->leftCornerWidget && d->leftCornerWidget->isVisible())
lc = d->leftCornerWidget->sizeHint(); lc = d->leftCornerWidget->sizeHint();
if (d->rightCornerWidget) if (d->rightCornerWidget && d->rightCornerWidget->isVisible())
rc = d->rightCornerWidget->sizeHint(); rc = d->rightCornerWidget->sizeHint();
if (!d->dirty) { if (!d->dirty) {
QTabWidget *that = const_cast<QTabWidget*>(this); QTabWidget *that = const_cast<QTabWidget*>(this);
@ -1256,14 +1256,14 @@ void QTabWidget::paintEvent(QPaintEvent *)
Q_D(QTabWidget); Q_D(QTabWidget);
if (documentMode()) { if (documentMode()) {
QStylePainter p(this, tabBar()); QStylePainter p(this, tabBar());
if (QWidget *w = cornerWidget(Qt::TopLeftCorner)) { if (QWidget *w = cornerWidget(Qt::TopLeftCorner); w && w->isVisible()) {
QStyleOptionTabBarBase opt; QStyleOptionTabBarBase opt;
QTabBarPrivate::initStyleBaseOption(&opt, tabBar(), w->size()); QTabBarPrivate::initStyleBaseOption(&opt, tabBar(), w->size());
opt.rect.moveLeft(w->x() + opt.rect.x()); opt.rect.moveLeft(w->x() + opt.rect.x());
opt.rect.moveTop(w->y() + opt.rect.y()); opt.rect.moveTop(w->y() + opt.rect.y());
p.drawPrimitive(QStyle::PE_FrameTabBarBase, opt); p.drawPrimitive(QStyle::PE_FrameTabBarBase, opt);
} }
if (QWidget *w = cornerWidget(Qt::TopRightCorner)) { if (QWidget *w = cornerWidget(Qt::TopRightCorner); w && w->isVisible()) {
QStyleOptionTabBarBase opt; QStyleOptionTabBarBase opt;
QTabBarPrivate::initStyleBaseOption(&opt, tabBar(), w->size()); QTabBarPrivate::initStyleBaseOption(&opt, tabBar(), w->size());
opt.rect.moveLeft(w->x() + opt.rect.x()); opt.rect.moveLeft(w->x() + opt.rect.x());