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

Set correct content size for tool tip label

Browse Source 
The tool tip content size uses an incorrect content margin, when it's
constructed. This content margin has been reset to correct value when
tool tip is positioned using placeTip(). But after that, the content
size not been recalculated.

This patch triggers updatesSize() to calculate content size with
updated content margin values.

Fixes: QTBUG-119752
Pick-to: 6.5
Change-Id: I454c8528505686f2724b897e4002f78f3049149a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit e977a629277796880d1557e4841f731d1ef27c06)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 8dcb5814e09adb540fb5df69d759d1fdbfabe287)
This commit is contained in:
Santhosh Kumar 2023-12-14 19:15:13 +01:00 committed by Qt Cherry-pick Bot
parent f981cdc31d
commit c662dadd4a
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/kernel/qtooltip.cpp
View File

@ -356,10 +356,12 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w)
if (w) {
connect(w, SIGNAL(destroyed()),
QTipLabel::instance, SLOT(styleSheetParentDestroyed()));
// QTBUG-64550: A font inherited by the style sheet might change the size,
// particular on Windows, where the tip is not parented on a window.
QTipLabel::instance->updateSize(pos);
}
// QTBUG-64550: A font inherited by the style sheet might change the size,
// particular on Windows, where the tip is not parented on a window.
// The updatesSize() also makes sure that the content size be updated with
// correct content margin.
QTipLabel::instance->updateSize(pos);
}
#endif //QT_NO_STYLE_STYLESHEET

26
tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
View File

@ -26,6 +26,7 @@ private slots:
void setPalette();
void qtbug64550_stylesheet();
void dontCrashOutsideScreenGeometry();
void marginSetWithStyleSheet();
};
void tst_QToolTip::init()
@ -214,5 +215,30 @@ void tst_QToolTip::dontCrashOutsideScreenGeometry() {
QToolTip::hideText();
}
void tst_QToolTip::marginSetWithStyleSheet()
{
const char *toolTipText = "Test Tool Tip";
qApp->setStyleSheet("QToolTip {font-size: 8px; margin: 5px;}");
QToolTip::showText(QGuiApplication::primaryScreen()->availableGeometry().topLeft(), toolTipText);
QTRY_VERIFY(QToolTip::isVisible());
QWidget *toolTip = findToolTip();
QVERIFY(toolTip);
QTRY_VERIFY(toolTip->isVisible());
int toolTipHeight = toolTip->size().height();
qApp->setStyleSheet(QString());
QToolTip::hideText();
qApp->setStyleSheet("QToolTip {font-size: 8px; margin: 10px;}");
QToolTip::showText(QGuiApplication::primaryScreen()->availableGeometry().topLeft(), toolTipText);
QTRY_VERIFY(QToolTip::isVisible());
toolTip = findToolTip();
QVERIFY(toolTip);
QTRY_VERIFY(toolTip->isVisible());
QCOMPARE_LE(toolTip->size().height(), toolTipHeight + 10);
qApp->setStyleSheet(QString());
QToolTip::hideText();
}
QTEST_MAIN(tst_QToolTip)
#include "tst_qtooltip.moc"